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 2013/12/23 06:45:29 UTC
svn commit: r1553072 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Author: markrmiller
Date: Mon Dec 23 05:45:28 2013
New Revision: 1553072
URL: http://svn.apache.org/r1553072
Log:
SOLR-5569: fix how this check is done - we need to hit the rest of the loop, not continue
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1553072&r1=1553071&r2=1553072&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Mon Dec 23 05:45:28 2013
@@ -909,10 +909,10 @@ public class CoreAdminHandler extends Re
live = clusterState.liveNodesContain(nodeName);
String localState = cloudDescriptor.getLastPublished();
- if (onlyIfLeaderActive != null && onlyIfLeaderActive && (localState == null || !localState.equals(ZkStateReader.ACTIVE))) {
- continue;
- }
- if (nodeProps != null && state.equals(waitForState)) {
+
+ boolean onlyIfActiveCheckResult = onlyIfLeaderActive != null && onlyIfLeaderActive && (localState == null || !localState.equals(ZkStateReader.ACTIVE));
+
+ if (!onlyIfActiveCheckResult && nodeProps != null && state.equals(waitForState)) {
if (checkLive == null) {
break;
} else if (checkLive && live) {