svn commit: r1593977 - in /lucene/dev/branches/solr5473/solr: core/src/test/org/apache/solr/cloud/ solrj/src/java/org/apache/solr/common/cloud/ test-framework/src/java/org/apache/solr/cloud/

[no...@apache.org]

Author: noble
Date: Mon May 12 14:35:17 2014
New Revision: 1593977

URL: http://svn.apache.org/r1593977
Log:
 Getting rid of some typos

Modified:
    lucene/dev/branches/solr5473/solr/core/src/test/org/apache/solr/cloud/ExternalCollectionsTest.java
    lucene/dev/branches/solr5473/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
    lucene/dev/branches/solr5473/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
    lucene/dev/branches/solr5473/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java

Modified: lucene/dev/branches/solr5473/solr/core/src/test/org/apache/solr/cloud/ExternalCollectionsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5473/solr/core/src/test/org/apache/solr/cloud/ExternalCollectionsTest.java?rev=1593977&r1=1593976&r2=1593977&view=diff
==============================================================================
--- lucene/dev/branches/solr5473/solr/core/src/test/org/apache/solr/cloud/ExternalCollectionsTest.java (original)
+++ lucene/dev/branches/solr5473/solr/core/src/test/org/apache/solr/cloud/ExternalCollectionsTest.java Mon May 12 14:35:17 2014
@@ -92,7 +92,7 @@ public class ExternalCollectionsTest ext
     DocCollection c = ZkStateReader.getCollectionLive(cloudClient.getZkStateReader(), collectionName);
     ClusterState clusterState = cloudClient.getZkStateReader().getClusterState();
     assertEquals("The zkversion of the nodes must be same zkver:" + stat.getVersion() , stat.getVersion(),clusterState.getCollection(collectionName).getZnodeVersion() );
-    assertTrue("DocCllection#isExternal() must be true", cloudClient.getZkStateReader().getClusterState().getCollection(collectionName).getStateFormat() > 1);
+    assertTrue("DocCllection#getStateFormat() must be > 1", cloudClient.getZkStateReader().getClusterState().getCollection(collectionName).getStateFormat() > 1);
 
 
     // remove collection

Modified: lucene/dev/branches/solr5473/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5473/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java?rev=1593977&r1=1593976&r2=1593977&view=diff
==============================================================================
--- lucene/dev/branches/solr5473/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java (original)
+++ lucene/dev/branches/solr5473/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java Mon May 12 14:35:17 2014
@@ -68,7 +68,6 @@ public class DocCollection extends ZkNod
     this.router = router;
     this.znode = znode == null? ZkStateReader.CLUSTER_STATE : znode;
     assert name != null && slices != null;
-    if("myExternColl".equals(name) && getStateFormat()==1) throw new RuntimeException("Some problem with colection creation");
   }
 
   public DocCollection copyWith(Map<String, Slice> slices){

Modified: lucene/dev/branches/solr5473/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5473/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java?rev=1593977&r1=1593976&r2=1593977&view=diff
==============================================================================
--- lucene/dev/branches/solr5473/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java (original)
+++ lucene/dev/branches/solr5473/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java Mon May 12 14:35:17 2014
@@ -859,7 +859,7 @@ public class ZkStateReader {
 
           } catch (InterruptedException e) {
             // Restore the interrupted status
-            Thread.currentThread().interrupt();
+            Thread.interrupted();
             log.error("Unwatched collection :"+coll , e);
             return;
           }

Modified: lucene/dev/branches/solr5473/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5473/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1593977&r1=1593976&r2=1593977&view=diff
==============================================================================
--- lucene/dev/branches/solr5473/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/branches/solr5473/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Mon May 12 14:35:17 2014
@@ -1513,7 +1513,7 @@ public abstract class AbstractFullDistri
     }
     params.set("name", collectionName);
     if (useExternalCollections()) {
-      log.info("Creating collection with stateFormat=3: " + collectionName);
+      log.info("Creating collection with stateFormat=2: " + collectionName);
       params.set(DocCollection.STATE_FORMAT, "2");
     }
     SolrRequest request = new QueryRequest(params);