From e32f6e5e675cc32a85be2115f4d0a069a921b500 Mon Sep 17 00:00:00 2001
From: Christine Poerschke <cpoerschke@apache.org>
Date: Fri, 27 Nov 2015 20:01:25 +0000
Subject: [PATCH] SOLR-8340: Fixed NullPointerException in HighlightComponent.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1716911 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/CHANGES.txt                                              | 3 +++
 .../org/apache/solr/handler/component/HighlightComponent.java | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c5a4e599bc3..b91f097b764 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -188,6 +188,9 @@ Other Changes
 * LUCENE-6900: Added test for score ordered grouping, and refactored TopGroupsResultTransformer.
   (David Smiley)
 
+* SOLR-8340: Fixed NullPointerException in HighlightComponent.
+  (zengjie via Christine Poerschke)
+
 
 ==================  5.4.0 ==================
 
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
index 334f75a6ff1..7dc1f6db794 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
@@ -190,6 +190,10 @@ public class HighlightComponent extends SearchComponent implements PluginInfoIni
           for (int i=0; i<hl.size(); i++) {
             String id = hl.getName(i);
             ShardDoc sdoc = rb.resultIds.get(id);
+            // sdoc maybe null
+            if (sdoc == null) {
+                continue;
+            }
             int idx = sdoc.positionInResponse;
             arr[idx] = new NamedList.NamedListEntry<>(id, hl.getVal(i));
           }