make TokenMetadata.relocatingTokens a ConcurrentMap patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5634
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b525c1f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b525c1f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b525c1f Branch: refs/heads/trunk Commit: 5b525c1fc3cca4ae8884593b83c89546d317cd49 Parents: 42be16f Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Jun 19 13:55:40 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Jun 19 13:56:01 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b525c1f/src/java/org/apache/cassandra/locator/TokenMetadata.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/TokenMetadata.java b/src/java/org/apache/cassandra/locator/TokenMetadata.java index 925a811..1f6682b 100644 --- a/src/java/org/apache/cassandra/locator/TokenMetadata.java +++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java @@ -85,7 +85,7 @@ public class TokenMetadata private final Set<Pair<Token, InetAddress>> movingEndpoints = new HashSet<Pair<Token, InetAddress>>(); // tokens which are migrating to new endpoints - private final Map<Token, InetAddress> relocatingTokens = new HashMap<Token, InetAddress>(); + private final ConcurrentMap<Token, InetAddress> relocatingTokens = new ConcurrentHashMap<Token, InetAddress>(); /* Use this lock for manipulating the token map */ private final ReadWriteLock lock = new ReentrantReadWriteLock(true);
