Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-12901: UH: handle highlighting no fields Fixes CustomHighlightComponentTest.

David Smiley476ab1e17514
diff --git a/solr/core/src/java/org/apache/solr/highlight/UnifiedSolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/UnifiedSolrHighlighter.java
index 4466132c1e2..4c562000cbb 100644
--- a/solr/core/src/java/org/apache/solr/highlight/UnifiedSolrHighlighter.java
+++ b/solr/core/src/java/org/apache/solr/highlight/UnifiedSolrHighlighter.java
@@ -18,6 +18,7 @@ package org.apache.solr.highlight;
import java.io.IOException;
import java.text.BreakIterator;
+import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
import java.util.Locale;
@@ -145,7 +146,10 @@ public class UnifiedSolrHighlighter extends SolrHighlighter implements PluginInf
}
UnifiedHighlighter highlighter = getHighlighter(req);
- Map<String, String[]> snippets = highlighter.highlightFields(fieldNames, query, docIDs, maxPassages);
+ Map<String, String[]> snippets =
+ fieldNames.length == 0
+ ? Collections.emptyMap()
+ : highlighter.highlightFields(fieldNames, query, docIDs, maxPassages);
return encodeSnippets(keys, fieldNames, snippets);
}