You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2015/11/30 11:50:35 UTC
svn commit: r1717224 - in /lucene/dev/branches/lucene_solr_5_4: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
Author: cpoerschke
Date: Mon Nov 30 10:50:34 2015
New Revision: 1717224
URL: http://svn.apache.org/viewvc?rev=1717224&view=rev
Log:
SOLR-8340: Fixed NullPointerException in HighlightComponent. (merge in revision 1716917 from branch_5x)
Modified:
lucene/dev/branches/lucene_solr_5_4/ (props changed)
lucene/dev/branches/lucene_solr_5_4/solr/ (props changed)
lucene/dev/branches/lucene_solr_5_4/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_5_4/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_5_4/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
Modified: lucene/dev/branches/lucene_solr_5_4/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_4/solr/CHANGES.txt?rev=1717224&r1=1717223&r2=1717224&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_4/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_5_4/solr/CHANGES.txt Mon Nov 30 10:50:34 2015
@@ -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
----------------------
Modified: lucene/dev/branches/lucene_solr_5_4/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_4/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java?rev=1717224&r1=1717223&r2=1717224&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_4/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java (original)
+++ lucene/dev/branches/lucene_solr_5_4/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java Mon Nov 30 10:50:34 2015
@@ -190,6 +190,10 @@ public class HighlightComponent extends
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));
}