Updated Branches: refs/heads/cassandra-1.2 b2daab711 -> 3280fb087 refs/heads/trunk e4ebd5ff5 -> eec01e9fe
another inverted condition Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3280fb08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3280fb08 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3280fb08 Branch: refs/heads/cassandra-1.2 Commit: 3280fb087801de8b66eaf32e7b73a9e74a07d0ce Parents: b2daab7 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jul 15 23:44:39 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jul 15 23:44:39 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3280fb08/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 1f7fcdf..7f1bdbc 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -920,7 +920,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE { isBootstrapMode = true; SystemTable.updateTokens(tokens); // DON'T use setToken, that makes us part of the ring locally which is incorrect until we are done bootstrapping - if (DatabaseDescriptor.isReplacing()) + if (!DatabaseDescriptor.isReplacing()) { // if not an existing token then bootstrap // order is important here, the gossiper can fire in between adding these two states. It's ok to send TOKENS without STATUS, but *not* vice versa.
