Apache Solr open-source search software
SolrMessageProcessor: add resilience to NPE from test mocks (#4824)
David Smileybbb1babcfe73
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.javaindex 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 MessageProcessorboolean connected = false;while (!connected) {try {- // forces a ZK round-trip, throwing if the cluster is unreachable+ // a probe; throws if the cluster isn't reachableclientSupplier.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);