(solr) branch main updated: SolrMessageProcessor: add resilience to NPE from test mocks (#4824)

[dsmiley]

This is an automated email from the ASF dual-hosted git repository.

dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new bbb1babcfe7 SolrMessageProcessor: add resilience to NPE from test 
mocks (#4824)
bbb1babcfe7 is described below

commit bbb1babcfe73cc31eb9046e5f21cf45599b09057
Author: David Smiley <dsmi...@apache.org>
AuthorDate: Thu Sep 3 19:43:09 2026 -0400

    SolrMessageProcessor: add resilience to NPE from test mocks (#4824)
---
 .../solr/crossdc/manager/messageprocessor/SolrMessageProcessor.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/messageprocessor/SolrMessageProcessor.java
 
b/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/messageprocessor/SolrMessageProcessor.java
index ad9033fe1b3..21c790903eb 100644
--- 
a/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/messageprocessor/SolrMessageProcessor.java
+++ 
b/solr/cross-dc-manager/src/java/org/apache/solr/crossdc/manager/messageprocessor/SolrMessageProcessor.java
@@ -338,9 +338,12 @@ public class SolrMessageProcessor extends MessageProcessor
     boolean connected = false;
     while (!connected) {
       try {
-        // forces a ZK round-trip, throwing if the cluster is unreachable
+        // a probe; throws if the cluster isn't reachable
         clientSupplier.get().getClusterStateProvider().getLiveNodes();
         connected = true;
+      } catch (NullPointerException | ClassCastException e) {
+        // a bug rather than an unreachable cluster; retrying it would loop 
forever
+        throw e;
       } catch (Exception e) {
         log.error("Unable to connect to solr server. Not consuming.", e);
         uncheckedSleep(5000);