From 494bd461e9d465ecf97b3123486ce97419d79e67 Mon Sep 17 00:00:00 2001
From: Alessandro Benedetti <a.benedetti@sease.io>
Date: Wed, 10 Jun 2020 11:34:58 +0100
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 feature/SEARCH-2228-phrase

# Conflicts:
#	search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoSolrDataModel.java
---
 .../main/java/org/alfresco/solr/query/Solr4QueryParser.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
index 8507e9f59..e7dd53349 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
@@ -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;