Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-9093: Fix NullPointerException in TopGroupsShardResponseProcessor.

This commit is contained in:
Christine Poerschke 2016-05-11 13:42:46 +01:00
parent 184983280e
commit 574a6a9d65
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -170,6 +170,8 @@ Bug Fixes
* SOLR-9058: Makes HashJoinStream and OuterHashJoinStream support different field names in the * SOLR-9058: Makes HashJoinStream and OuterHashJoinStream support different field names in the
incoming streams, eg. fieldA=fieldB. (Dennis Gove, Stephan Osthold) incoming streams, eg. fieldA=fieldB. (Dennis Gove, Stephan Osthold)
* SOLR-9093: Fix NullPointerException in TopGroupsShardResponseProcessor. (Christine Poerschke)
Optimizations Optimizations
---------------------- ----------------------
* SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation. * SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation.

2
solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
View File

@ -99,7 +99,7 @@ public class TopGroupsShardResponseProcessor implements ShardResponseProcessor {
if (srsp.getException() != null) { if (srsp.getException() != null) {
Throwable t = srsp.getException(); Throwable t = srsp.getException();
if (t instanceof SolrServerException) { if (t instanceof SolrServerException && ((SolrServerException) t).getCause() != null) {
t = ((SolrServerException) t).getCause(); t = ((SolrServerException) t).getCause();
} }
individualShardInfo.add("error", t.toString()); individualShardInfo.add("error", t.toString());