Query DSL: Bool filter does not take should clauses properly into acc…

…ount, closes elastic#1511.
dadoonet · Nov 29, 2011 · ba1b77f · ba1b77f
1 parent e5816d9
commit ba1b77f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...es/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/XBooleanFilter.java b/...es/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/XBooleanFilter.java
@@ -82,6 +82,11 @@ public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
             }
         }
 
+        // if no should clauses match, return null (act as min_should_match set to 1)
+        if (res == null) {
+            return null;
+        }
+
         if (notFilters != null) {
             for (int i = 0; i < notFilters.size(); i++) {
                 if (res == null) {