Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-5569: fix how this check is done - we need to hit the rest of the loop, not continue 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1553072 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2013-12-23 05:45:28 +00:00
parent 07a07a5bd1
commit 8d9d344501
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
View File

@ -909,10 +909,10 @@ public class CoreAdminHandler extends RequestHandlerBase {
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) {