From de49a313c518c0953245be7a164d5bdd040c438f Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Tue, 29 Nov 2011 21:23:41 +0200
Subject: [PATCH] Query DSL: Bool filter does not take should clauses properly
 into account, closes #1511.

---
 .../elasticsearch/common/lucene/search/XBooleanFilter.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/XBooleanFilter.java b/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/XBooleanFilter.java
index d6768274068..9d19e3a3968 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/XBooleanFilter.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/XBooleanFilter.java
@@ -82,6 +82,11 @@ public class XBooleanFilter extends Filter {
             }
         }
 
+        // 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) {