From c787f31b58db6be9f9cb16abdd5ecb4e51e66a3a Mon Sep 17 00:00:00 2001
From: kimchy <kimchy@gmail.com>
Date: Tue, 17 May 2011 16:15:45 +0300
Subject: [PATCH] Search: Empty facets element causes search failures, closes
 #938.

---
 .../main/java/org/elasticsearch/search/facet/FacetPhase.java   | 2 +-
 .../elasticsearch/search/internal/ContextIndexSearcher.java    | 3 +++
 2 files changed, 4 insertions(+), 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
index c8d41e73d15e2..64c5b7faeb516 100644
--- 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/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
index 92c68b785497b..d846de8219d26 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
+++ b/modules/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);
     }