Merge remote-tracking branch 'origin/master' into feature/SEARCH-2228-phrase

# Conflicts:
#	search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java
This commit is contained in:
Alessandro Benedetti
2020-06-10 11:34:58 +01:00
parent c3b4e92ad6
commit 494bd461e9
@@ -2348,8 +2348,7 @@ public class Solr4QueryParser extends QueryParser implements QueryConstants
isShingled = true;
}
boolean forceConjuncion = rerankPhase == RerankPhase.QUERY_PHASE;
boolean forceConjuncion = (rerankPhase == RerankPhase.QUERY_PHASE && !isExactTermSearch(analysisMode));
if (list.size() == 0)
{
return null;