lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject lucene-solr:branch_6_0: SOLR-9093: Fix NullPointerException in TopGroupsShardResponseProcessor.
Date Fri, 20 May 2016 22:03:43 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6_0 fbf7d5446 -> eabbed778


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/eabbed77
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/eabbed77
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/eabbed77

Branch: refs/heads/branch_6_0
Commit: eabbed7787edab2e7d0a4b8f588f053ff5a8f963
Parents: fbf7d54
Author: Christine Poerschke <cpoerschke@apache.org>
Authored: Wed May 11 13:42:46 2016 +0100
Committer: Steve Rowe <sarowe@apache.org>
Committed: Fri May 20 18:03:18 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/eabbed77/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7da8ac8..db36444 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -72,6 +72,8 @@ Bug Fixes
 * SOLR-9058: Makes HashJoinStream and OuterHashJoinStream support different field names in
the
   incoming streams, eg. fieldA=fieldB. (Dennis Gove, Stephan Osthold)
 
+* SOLR-9093: Fix NullPointerException in TopGroupsShardResponseProcessor. (Christine Poerschke)
+
 Other Changes
 ----------------------
 * SOLR-7516: Improve javadocs for JavaBinCodec, ObjectResolver and enforce the single-usage
policy.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eabbed77/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());


Mime
View raw message