You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2019/03/05 21:56:44 UTC
[lucene-solr] branch master updated: SOLR-13295: Reproducible
failure in TestDistributedGrouping
This is an automated email from the ASF dual-hosted git repository.
erick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new 558c515 SOLR-13295: Reproducible failure in TestDistributedGrouping
558c515 is described below
commit 558c515bf3ef4d8c2e0aab45e4ea6668be9b30c6
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Tue Mar 5 13:56:40 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 1756367..62febfd 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -98,6 +98,8 @@ Bug Fixes
* SOLR-13285: Updates with enum fields and javabin cause ClassCastException (noble)
+* 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);
}
}