Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16485: Fix NPE in ShardHandlerFactory for standalone (#1100)

Houston Putman422d6fe8a00e
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 42f27190abb..ec0092412dc 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -252,6 +252,8 @@ Bug Fixes
* SOLR-16478 :removing a replica should delete the PRS entry from the hostnode and not from overseer (Patson Luk via noble)
+* SOLR-16485: Fix NPE in ShardHandlerFactory when running in Standalone mode (Houston Putman)
+
Other Changes
---------------------
* SOLR-16351: Upgrade Carrot2 to 4.4.3, upgrade randomizedtesting to 2.8.0. (Dawid Weiss)
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
index 6b3af985ef7..dcb54f6cf51 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
@@ -297,7 +297,9 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory
@Override
public void setSecurityBuilder(HttpClientBuilderPlugin clientBuilderPlugin) {
- clientBuilderPlugin.setup(defaultClient);
+ if (clientBuilderPlugin != null) {
+ clientBuilderPlugin.setup(defaultClient);
+ }
}
protected <T> T getParameter(