Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-17209: Fix NullPointerException in QueryComponent (#2354)

Vincent Primault1a322d9fd07e
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 44f58030013..7cf02fdbe19 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -148,6 +148,8 @@ Bug Fixes
* SOLR-14892: Queries with shards.info and shards.tolerant can yield multiple null keys in place of shard names
(Mathieu Marie, David Smiley)
+* SOLR-17209: Fix NullPointerException in QueryComponent (Vincent Primault via Eric Pugh)
+
Dependency Upgrades
---------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
index 8b34422ddfe..4f17cb7652b 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -956,7 +956,7 @@ public class QueryComponent extends SearchComponent {
if (srsp.getException() != null) {
Throwable t = srsp.getException();
- if (t instanceof SolrServerException) {
+ if (t instanceof SolrServerException && t.getCause() != null) {
t = t.getCause();
}
nl.add("error", t.toString());