Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9AE581727A for ; Thu, 9 Apr 2015 15:49:13 +0000 (UTC) Received: (qmail 86770 invoked by uid 500); 9 Apr 2015 15:49:13 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 86761 invoked by uid 99); 9 Apr 2015 15:49:13 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2015 15:49:13 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 45A5DAC00B4 for ; Thu, 9 Apr 2015 15:49:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1672402 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSlice.java Date: Thu, 09 Apr 2015 15:49:13 -0000 To: commits@lucene.apache.org From: shalin@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150409154913.45A5DAC00B4@hades.apache.org> Author: shalin Date: Thu Apr 9 15:49:12 2015 New Revision: 1672402 URL: http://svn.apache.org/r1672402 Log: SOLR-7371: Fix NPE when scores are null Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSlice.java Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSlice.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSlice.java?rev=1672402&r1=1672401&r2=1672402&view=diff ============================================================================== --- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSlice.java (original) +++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSlice.java Thu Apr 9 15:49:12 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