svn commit: r1236378 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java

[ma...@apache.org]

Author: markrmiller
Date: Thu Jan 26 20:38:04 2012
New Revision: 1236378

URL: http://svn.apache.org/viewvc?rev=1236378&view=rev
Log:
add a bit of javadoc and be sure we don't register as active unless a recovery was *not* started

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

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1236378&r1=1236377&r2=1236378&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java Thu Jan 26 20:38:04 2012
@@ -534,7 +534,7 @@ public final class ZkController {
         
         boolean didRecovery = checkRecovery(coreName, desc, recoverReloadedCores, isLeader, cloudDesc,
             collection, coreZkNodeName, shardId, leaderProps, core, cc);
-        if (didRecovery) {
+        if (!didRecovery) {
           publishAsActive(baseUrl, desc, coreZkNodeName, coreName);
         }
       } finally {
@@ -563,6 +563,24 @@ public final class ZkController {
   }
 
 
+  /**
+   * @param coreName
+   * @param desc
+   * @param recoverReloadedCores
+   * @param isLeader
+   * @param cloudDesc
+   * @param collection
+   * @param shardZkNodeName
+   * @param shardId
+   * @param leaderProps
+   * @param core
+   * @param cc
+   * @return whether or not a recovery was started
+   * @throws InterruptedException
+   * @throws KeeperException
+   * @throws IOException
+   * @throws ExecutionException
+   */
   private boolean checkRecovery(String coreName, final CoreDescriptor desc,
       boolean recoverReloadedCores, final boolean isLeader,
       final CloudDescriptor cloudDesc, final String collection,