You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/10/30 16:30:19 UTC
git commit: Fix broken isInitialized check from maybeJoinRing (#4679)
Updated Branches:
refs/heads/trunk 312ca136a -> a850abd16
Fix broken isInitialized check from maybeJoinRing (#4679)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a850abd1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a850abd1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a850abd1
Branch: refs/heads/trunk
Commit: a850abd16e2d87200e942e9523548f17ba3a6e7b
Parents: 312ca13
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Oct 30 16:26:06 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Oct 30 16:29:31 2012 +0100
----------------------------------------------------------------------
.../apache/cassandra/service/StorageService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a850abd1/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 ad4a534..cfe6982 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -416,7 +416,6 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
throw new UnsupportedOperationException("StorageService does not support switching modes.");
return;
}
- initialized = true;
isClientMode = false;
// Ensure StorageProxy is initialized on start-up; see CASSANDRA-3797.
@@ -514,6 +513,7 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
throw new UnsupportedOperationException("StorageService does not support switching modes.");
return;
}
+ initialized = true;
if (Boolean.parseBoolean(System.getProperty("cassandra.join_ring", "true")))
{