You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2011/12/14 22:31:55 UTC

svn commit: r1214484 - /lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java

Author: markrmiller
Date: Wed Dec 14 21:31:54 2011
New Revision: 1214484

URL: http://svn.apache.org/viewvc?rev=1214484&view=rev
Log:
fix a check on this test

Modified:
    lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java

Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1214484&r1=1214483&r2=1214484&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Wed Dec 14 21:31:54 2011
@@ -139,7 +139,7 @@ public class OverseerTest extends SolrTe
     while (0 < maxIterations--) {
       CloudState state = stateReader.getCloudState();
       Map<String,Slice> sliceMap = state.getSlices(collection);
-      if (sliceMap.keySet().size() == i) {
+      if (sliceMap != null && sliceMap.keySet().size() == i) {
         return;
       }
       Thread.sleep(50);
@@ -335,6 +335,7 @@ public class OverseerTest extends SolrTe
       zkClient2
           .setData(nodePath, ZkStateReader.toJSON(new CoreState[] {state}));
       
+      // nocommit - we should do short waits and poll
       Thread.sleep(1000); // wait for data to update
       
       // zkClient2.printLayoutToStdOut();