lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject [lucene-solr] branch branch_8x updated: SOLR-13295: Reproducible failure in TestDistributedGrouping
Date Tue, 05 Mar 2019 22:06:51 GMT
This is an automated email from the ASF dual-hosted git repository.

erick pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new bbf4cbc  SOLR-13295: Reproducible failure in TestDistributedGrouping
bbf4cbc is described below

commit bbf4cbc17e3d150315e70a9a8c46f1ed82c63c13
Author: Erick Erickson <Erick.Erickson@gmail.com>
AuthorDate: Tue Mar 5 14:02:42 2019 -0800

    SOLR-13295: Reproducible failure in TestDistributedGrouping
---
 solr/CHANGES.txt                                                        | 2 ++
 .../src/java/org/apache/solr/handler/component/ResponseBuilder.java     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 030a03d..e1ea0f6 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -77,6 +77,8 @@ Bug Fixes
 * SOLR-9882: 500 error code on breaching timeAllowed by core and distributed (fsv) search,

   old and json facets (Mikhail Khludnev)
 
+* SOLR-13295: Reproducible failure in TestDistributedGrouping (Erick Erickson)
+
 Improvements
 ----------------------
 * SOLR-12999: Index replication could delete segments before downloading segments from master
if there is not enough
diff --git a/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java b/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
index f757ad7..913c710 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
@@ -463,7 +463,7 @@ public class ResponseBuilder
     if (result.isPartialResults()) {
       rsp.getResponseHeader().asShallowMap()
           .put(SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY, Boolean.TRUE);
-      if(getResults().docList==null) {
+      if(getResults() != null && getResults().docList==null) {
         getResults().docList = new DocSlice(0, 0, new int[] {}, new float[] {}, 0, 0);
       }
     }


Mime
View raw message