You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/06/20 17:39:07 UTC
git commit: Fix bootstrap test
Updated Branches:
refs/heads/trunk e6530cc37 -> 930fdc59e
Fix bootstrap test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/930fdc59
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/930fdc59
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/930fdc59
Branch: refs/heads/trunk
Commit: 930fdc59ecd5eb5b1e3e45d85fc8c8c65f205efb
Parents: e6530cc
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jun 20 10:38:58 2012 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jun 20 10:38:58 2012 -0500
----------------------------------------------------------------------
.../apache/cassandra/service/StorageService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/930fdc59/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 012f2ec..d7dba7d 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1017,8 +1017,11 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
{
if (MessagingService.instance().knowsVersion(endpoint) && MessagingService.instance().getVersion(endpoint) >= MessagingService.VERSION_12)
return true;
- else if (Gossiper.instance.getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.NET_VERSION) != null && Integer.valueOf(Gossiper.instance.getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.NET_VERSION).value) >= MessagingService.VERSION_12)
- return true;
+ else if (Gossiper.instance.getEndpointStateForEndpoint(endpoint) != null) // simply to pass the bootstrap test
+ {
+ if (Gossiper.instance.getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.NET_VERSION) != null && Integer.valueOf(Gossiper.instance.getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.NET_VERSION).value) >= MessagingService.VERSION_12)
+ return true;
+ }
return false;
}