Search: Empty facets element causes search failures, closes elastic#938.

mute · May 17, 2011 · c787f31 · c787f31
1 parent ee18228
commit c787f31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetPhase.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/FacetPhase.java
@@ -59,7 +59,7 @@ public class FacetPhase implements SearchPhase {
     }
 
     @Override public void execute(SearchContext context) throws ElasticSearchException {
-        if (context.facets() == null) {
+        if (context.facets() == null || context.facets().facetCollectors() == null) {
             return;
         }
         if (context.queryResult().facets() != null) {

diff --git a/...s/elasticsearch/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java b/...s/elasticsearch/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
@@ -78,6 +78,9 @@ public void addCollector(String scope, Collector collector) {
     }
 
     public List<Collector> removeCollectors(String scope) {
+        if (scopeCollectors == null) {
+            return null;
+        }
         return scopeCollectors.remove(scope);
     }