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/18 00:10:19 UTC

svn commit: r1220301 - /lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java

Author: markrmiller
Date: Sat Dec 17 23:10:19 2011
New Revision: 1220301

URL: http://svn.apache.org/viewvc?rev=1220301&view=rev
Log:
remove param

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

Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1220301&r1=1220300&r2=1220301&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java Sat Dec 17 23:10:19 2011
@@ -543,7 +543,7 @@ public final class ZkController {
         }
         
         // publish new props
-        publishAsActive(shardUrl, cloudDesc, shardZkNodeName, shardId);
+        publishAsActive(shardUrl, cloudDesc, shardZkNodeName);
       } else {
         CoreContainer cc = desc.getCoreContainer();
         // CoreContainer can be null for some tests...
@@ -567,7 +567,7 @@ public final class ZkController {
           @Override
           public void run() {
             // publish new props
-            publishAsActive(shardUrl, cloudDesc, shardZkNodeName, cloudDesc.getShardId());
+            publishAsActive(shardUrl, cloudDesc, shardZkNodeName);
             
           }});
       }
@@ -585,12 +585,12 @@ public final class ZkController {
 
 
   private void publishAsActive(String shardUrl,
-      final CloudDescriptor cloudDesc, String shardZkNodeName, String shardId) {
+      final CloudDescriptor cloudDesc, String shardZkNodeName) {
     Map<String,String> finalProps = new HashMap<String,String>();
     finalProps.put(ZkStateReader.URL_PROP, shardUrl);
     finalProps.put(ZkStateReader.NODE_NAME_PROP, getNodeName());
     finalProps.put(ZkStateReader.STATE_PROP, ZkStateReader.ACTIVE);
-    finalProps.put(ZkStateReader.SHARD_ID_PROP, shardId);
+    finalProps.put(ZkStateReader.SHARD_ID_PROP, cloudDesc.getShardId());
     publishState(cloudDesc, shardZkNodeName, finalProps);
   }