You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2022/10/21 21:06:49 UTC
[solr] branch branch_9x updated: SOLR-16485: Fix NPE in ShardHandlerFactory for standalone (#1100)
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new d1a39e50f2a SOLR-16485: Fix NPE in ShardHandlerFactory for standalone (#1100)
d1a39e50f2a is described below
commit d1a39e50f2a0e005b4e4d1a7ec736df77f7fdeda
Author: Houston Putman <ho...@apache.org>
AuthorDate: Fri Oct 21 17:03:06 2022 -0400
SOLR-16485: Fix NPE in ShardHandlerFactory for standalone (#1100)
(cherry picked from commit 422d6fe8a00e3afefdcc26ceab434cce03b4a048)
---
solr/CHANGES.txt | 2 ++
.../org/apache/solr/handler/component/HttpShardHandlerFactory.java | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 18612c89334..1fe8572cf0d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -225,6 +225,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(