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:09:42 UTC
[solr] branch branch_9_1 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_9_1
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9_1 by this push:
new 88978b68abf SOLR-16485: Fix NPE in ShardHandlerFactory for standalone (#1100)
88978b68abf is described below
commit 88978b68abf9d9ac41a038b84a76f2e8a587b807
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 f1d5f5768b3..6a5f73e3ec5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -167,6 +167,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 977e3f180dc..4956356e1a2 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
@@ -296,7 +296,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(