Apache Solr open-source search software
SOLR-16257: Fix ZkStateReaderTest NPE when checking node version (#966)
Kevin Risdenbc29fee5de88
diff --git a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.javaindex ac34bfaa1ae..4d7e8b67cc8 100644--- a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java@@ -250,9 +250,7 @@ public class ZkStateReaderTest extends SolrTestCaseJ4 {TimeOut timeOut = new TimeOut(5000, TimeUnit.MILLISECONDS, TimeSource.NANO_TIME);timeOut.waitFor("Timeout on waiting for c1 to show up in cluster state",- () ->- reader.getClusterState().getCollectionRef("c1") != null- && reader.getClusterState().getCollectionRef("c1").get() != null);+ () -> reader.getClusterState().getCollectionOrNull("c1") != null);ClusterState.CollectionRef ref = reader.getClusterState().getCollectionRef("c1");assertFalse(ref.isLazilyLoaded());@@ -298,7 +296,7 @@ public class ZkStateReaderTest extends SolrTestCaseJ4 {clusterState = writer.writePendingUpdates();timeOut.waitFor("Timeout on waiting for c1 to be removed from cluster state",- () -> reader.getClusterState().getCollectionRef("c1").get() == null);+ () -> reader.getClusterState().getCollectionOrNull("c1") == null);reader.unregisterCore("c1");// re-add the same collection@@ -311,9 +309,7 @@ public class ZkStateReaderTest extends SolrTestCaseJ4 {// reader.forceUpdateCollection("c1");timeOut.waitFor("Timeout on waiting for c1 to show up in cluster state again",- () ->- reader.getClusterState().getCollectionRef("c1") != null- && reader.getClusterState().getCollectionRef("c1").get() != null);+ () -> reader.getClusterState().getCollectionOrNull("c1") != null);ref = reader.getClusterState().getCollectionRef("c1");assertFalse(ref.isLazilyLoaded());assertEquals(0, ref.get().getZNodeVersion());