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/27 22:28:32 UTC
svn commit: r1716917 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
Author: cpoerschke
Date: Fri Nov 27 21:28:32 2015
New Revision: 1716917
URL: http://svn.apache.org/viewvc?rev=1716917&view=rev
Log:
SOLR-8340: Fixed NullPointerException in HighlightComponent. (merge in revision 1716911 from trunk)
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1716917&r1=1716916&r2=1716917&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Fri Nov 27 21:28:32 2015
@@ -17,6 +17,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 ==================
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java?rev=1716917&r1=1716916&r2=1716917&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java Fri Nov 27 21:28:32 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));
}