Apache Solr open-source search software
SOLR-17824: RecoveryStrategy.pingLeader could NPE when there's no leader. (#3414)
David Smiley6bb80bd72d5f
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 7077e17c8ac..ab044e2f409 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -216,6 +216,8 @@ Bug Fixes* SOLR-17717: Starting solr on newer Windows 11 Home complained about missing wmic (Jan Høydahl)+* SOLR-17824: RecoveryStrategy.pingLeader could NPE when there's no shard leader (David Smiley)+Dependency Upgrades---------------------(No changes)diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.javaindex 022ea8a9b34..a3e73366b5a 100644--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java@@ -799,11 +799,14 @@ public class RecoveryStrategy implements Runnable, Closeable {return null;}- Replica leaderReplica;+ Replica leaderReplica = null;try {leaderReplica =zkStateReader.getLeaderRetry(cloudDesc.getCollectionName(), cloudDesc.getShardId());} catch (SolrException e) {+ // ignore+ }+ if (leaderReplica == null) {Thread.sleep(500);continue;}