handle null query returning from query parsers properly

now that we support "null" queries, for example, when parsing a query and its lenient, make sure to handle it where applicable
martijnvg · Aug 9, 2012 · dff3b61 · dff3b61
1 parent e184a77
commit dff3b61
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/src/main/java/org/elasticsearch/index/query/FieldQueryParser.java b/src/main/java/org/elasticsearch/index/query/FieldQueryParser.java
@@ -166,6 +166,9 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
 
         try {
             query = queryParser.parse(qpSettings.queryString());
+            if (query == null) {
+                return null;
+            }
             query.setBoost(qpSettings.boost());
             query = optimizeQuery(fixNegativeQueryIfNeeded(query));
             if (query instanceof BooleanQuery) {

diff --git a/src/main/java/org/elasticsearch/index/query/MatchQueryParser.java b/src/main/java/org/elasticsearch/index/query/MatchQueryParser.java
@@ -139,6 +139,9 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
         }
 
         Query query = matchQuery.parse(type, fieldName, text);
+        if (query == null) {
+            return null;
+        }
 
         if (query instanceof BooleanQuery) {
             Queries.applyMinimumShouldMatch((BooleanQuery) query, minimumShouldMatch);

diff --git a/src/main/java/org/elasticsearch/index/query/MultiMatchQueryParser.java b/src/main/java/org/elasticsearch/index/query/MultiMatchQueryParser.java
@@ -169,6 +169,9 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
         }
 
         Query query = multiMatchQuery.parse(type, fieldNames, text);
+        if (query == null) {
+            return null;
+        }
 
         if (query instanceof BooleanQuery) {
             Queries.applyMinimumShouldMatch((BooleanQuery) query, minimumShouldMatch);

diff --git a/src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java b/src/main/java/org/elasticsearch/index/query/QueryStringQueryParser.java
@@ -210,6 +210,9 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
 
         try {
             query = queryParser.parse(qpSettings.queryString());
+            if (query == null) {
+                return null;
+            }
             query.setBoost(qpSettings.boost());
             query = optimizeQuery(fixNegativeQueryIfNeeded(query));
             if (query instanceof BooleanQuery) {