You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/04/09 17:49:56 UTC
svn commit: r1672403 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/search/DocSlice.java
Author: shalin
Date: Thu Apr 9 15:49:56 2015
New Revision: 1672403
URL: http://svn.apache.org/r1672403
Log:
SOLR-7371: Fix NPE when scores are null
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/DocSlice.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/DocSlice.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/DocSlice.java?rev=1672403&r1=1672402&r2=1672403&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/DocSlice.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/DocSlice.java Thu Apr 9 15:49:56 2015
@@ -59,7 +59,7 @@ public class DocSlice extends DocSetBase
this.scores=scores;
this.matches=matches;
this.maxScore=maxScore;
- this.ramBytesUsed = BASE_RAM_BYTES_USED + RamUsageEstimator.sizeOf(docs) + RamUsageEstimator.sizeOf(scores);
+ this.ramBytesUsed = BASE_RAM_BYTES_USED + RamUsageEstimator.sizeOf(docs) + (scores != null ? RamUsageEstimator.sizeOf(scores) : 0);
}
@Override