You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/06/17 21:17:27 UTC
lucene-solr:branch_5_5: SOLR-9093: Fix NullPointerException in
TopGroupsShardResponseProcessor.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_5_5 669b9cd00 -> 8f04a8843
SOLR-9093: Fix NullPointerException in TopGroupsShardResponseProcessor.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8f04a884
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8f04a884
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8f04a884
Branch: refs/heads/branch_5_5
Commit: 8f04a8843e0834997c08665875219eb747b60fff
Parents: 669b9cd
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed May 11 13:42:46 2016 +0100
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 17:15:48 2016 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../responseprocessor/TopGroupsShardResponseProcessor.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8f04a884/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ea374cd..e7f479b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -62,6 +62,8 @@ Bug Fixes
* SOLR-9036: Solr slave is doing full replication (entire index) of index after master restart.
(Lior Sapir, Mark Miller, shalin)
+* SOLR-9093: Fix NullPointerException in TopGroupsShardResponseProcessor. (Christine Poerschke)
+
======================= 5.5.1 =======================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8f04a884/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
index fa8de24..d0a06c5 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
@@ -99,7 +99,7 @@ public class TopGroupsShardResponseProcessor implements ShardResponseProcessor {
if (srsp.getException() != null) {
Throwable t = srsp.getException();
- if (t instanceof SolrServerException) {
+ if (t instanceof SolrServerException && ((SolrServerException) t).getCause() != null) {
t = ((SolrServerException) t).getCause();
}
individualShardInfo.add("error", t.toString());