Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/81286b0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81286b0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81286b0c
Branch: refs/heads/cassandra-2.1
Commit: 81286b0ca2fb5c667d89280b2a7955b2531975c3
Parents: 367c741 4e67631
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Tue May 27 18:12:25 2014 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Tue May 27 18:12:25 2014 -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/81286b0c/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 45bceb5,8e7c073..d261a47
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -768,9 -738,8 +768,9 @@@ public class StorageService extends Not
InetAddress existing =
tokenMetadata.getEndpoint(token);
if (existing != null)
{
- if
(Gossiper.instance.getEndpointStateForEndpoint(existing).getUpdateTimestamp() >
(System.currentTimeMillis() - delay))
+ long nanoDelay = delay * 1000000L;
+ if
(Gossiper.instance.getEndpointStateForEndpoint(existing).getUpdateTimestamp() >
(System.nanoTime() - nanoDelay))
- throw new
UnsupportedOperationException("Cannnot replace a live node... ");
+ throw new
UnsupportedOperationException("Cannot replace a live node... ");
current.add(existing);
}
else
