You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by aw...@apache.org on 2018/02/08 20:59:13 UTC
cassandra git commit: Fix mistakenly unused variable introduced by
CASSANDRA-7544 and potential CME in iterator
Repository: cassandra
Updated Branches:
refs/heads/trunk b2d20d4bb -> 3891598e6
Fix mistakenly unused variable introduced by CASSANDRA-7544 and potential CME in iterator
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-7544
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3891598e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3891598e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3891598e
Branch: refs/heads/trunk
Commit: 3891598e61ecb3fe2a029e27061ac28f4b58c29e
Parents: b2d20d4
Author: Ariel Weisberg <aw...@apple.com>
Authored: Wed Feb 7 10:49:23 2018 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Thu Feb 8 15:57:39 2018 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3891598e/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 16b6a81..09edc35 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -171,7 +171,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return getPrimaryRangeForEndpointWithinDC(keyspace, FBUtilities.getBroadcastAddressAndPort());
}
- private final Set<InetAddressAndPort> replicatingNodes = Collections.synchronizedSet(new HashSet<InetAddressAndPort>());
+ private final Set<InetAddressAndPort> replicatingNodes = Sets.newConcurrentHashSet();
private CassandraDaemon daemon;
private InetAddressAndPort removingNode;
@@ -530,7 +530,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
value = entry.getValue().getApplicationState(ApplicationState.STATUS);
}
- String[] pieces = splitValue(entry.getValue().getApplicationState(ApplicationState.STATUS));
+ String[] pieces = splitValue(value);
assert (pieces.length > 0);
String state = pieces[0];
if (state.equals(VersionedValue.STATUS_BOOTSTRAPPING) || state.equals(VersionedValue.STATUS_LEAVING) || state.equals(VersionedValue.STATUS_MOVING))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org