lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject lucene-solr:jira/solr-10878: SOLR-10878 Fix a bug in waitForCoreNodeGone.
Date Mon, 19 Jun 2017 10:36:00 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/jira/solr-10878 929986709 -> 2f57543f4


SOLR-10878 Fix a bug in waitForCoreNodeGone.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2f57543f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2f57543f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2f57543f

Branch: refs/heads/jira/solr-10878
Commit: 2f57543f47e201533fc1c64e2b475fd79d47a205
Parents: 9299867
Author: Andrzej Bialecki <ab@apache.org>
Authored: Mon Jun 19 12:35:36 2017 +0200
Committer: Andrzej Bialecki <ab@apache.org>
Committed: Mon Jun 19 12:35:36 2017 +0200

----------------------------------------------------------------------
 .../apache/solr/cloud/OverseerCollectionMessageHandler.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2f57543f/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
index a055033..5af35aa 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
@@ -435,8 +435,10 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
           deleted =  true;
         }
       }
-      // Return true if either someone already deleted the collection/slice/replica.
-      if (docCollection == null || deleted) break;
+      // Return true if someone already deleted the collection/slice/replica.
+      if (docCollection == null || deleted) {
+        return true;
+      }
     }
     return deleted;
   }


Mime
View raw message