Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Fix small race condition in DeleteReplicaTest

Houston Putman8160f9ffff86
diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
index 7984ca47e76..63fe4929af0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
@@ -504,7 +504,7 @@ public class DeleteReplicaTest extends SolrCloudTestCase {
private void waitForJettyInit(JettySolrRunner replica1Jetty, String replica1JettyNodeName)
throws InterruptedException {
TimeOut timeOut = new TimeOut(5, TimeUnit.SECONDS, TimeSource.NANO_TIME);
- while (!replica1Jetty.isRunning()) {
+ while (!replica1Jetty.isRunning() || replica1Jetty.getCoreContainer() == null) {
Thread.sleep(100);
if (timeOut.hasTimedOut())
fail("Wait for " + replica1JettyNodeName + " replica to init failed!");