mirror of
https://github.com/Alfresco/SearchServices.git
synced 2026-09-16 18:12:56 +00:00
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:
+1
-2
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user