Handle completion suggestion without contexts

This change fixes the handling of completion suggestion without contexts. Relates #36996
elastic · Jan 29, 2019 · 1930176 · 1930176
1 parent f3f9cab
commit 1930176
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...c/main/java/org/elasticsearch/search/suggest/completion/TopSuggestGroupDocsCollector.java b/...c/main/java/org/elasticsearch/search/suggest/completion/TopSuggestGroupDocsCollector.java
@@ -60,7 +60,9 @@ public void collect(int docID, CharSequence key, CharSequence context, float sco
         int globalDoc = docID + docBase;
         boolean isNewDoc = docContexts.containsKey(globalDoc) == false;
         List<CharSequence> contexts = docContexts.computeIfAbsent(globalDoc, k -> new ArrayList<>());
-        contexts.add(context);
+        if (context != null) {
+            contexts.add(context);
+        }
         if (isNewDoc) {
             super.collect(docID, key, context, score);
         }