You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by nk...@apache.org on 2016/02/08 23:35:40 UTC
[05/50] [abbrv] lucene-solr git commit: SOLR-8340: Fixed
NullPointerException in HighlightComponent. (merge in revision 1716917 from
branch_5x)
SOLR-8340: Fixed NullPointerException in HighlightComponent. (merge in revision 1716917 from branch_5x)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_5_4@1717224 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4f24ad79
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4f24ad79
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4f24ad79
Branch: refs/heads/branch_5_4
Commit: 4f24ad79a2aba3337bd789340c6b1dbaf8d15b89
Parents: 4722b72
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Nov 30 10:50:34 2015 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Nov 30 10:50:34 2015 +0000
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../org/apache/solr/handler/component/HighlightComponent.java | 4 ++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4f24ad79/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2a0c64c..929edaa 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -277,6 +277,8 @@ Bug Fixes
* SOLR-8326: If BasicAuth enabled, inter node requests fail after node restart (noble, Anshum Gupta)
+* SOLR-8340: Fixed NullPointerException in HighlightComponent.
+ (zengjie via Christine Poerschke)
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4f24ad79/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
----------------------------------------------------------------------
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 334f75a..7dc1f6d 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));
}