Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4338A1037F for ; Tue, 19 Nov 2013 17:28:04 +0000 (UTC) Received: (qmail 46018 invoked by uid 500); 19 Nov 2013 17:27:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 45936 invoked by uid 500); 19 Nov 2013 17:27:33 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 45899 invoked by uid 99); 19 Nov 2013 17:27:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Nov 2013 17:27:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C05B488013F; Tue, 19 Nov 2013 17:27:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Tue, 19 Nov 2013 17:27:33 -0000 Message-Id: In-Reply-To: <6e903fd8e7ee476ea7fc24f12986f254@git.apache.org> References: <6e903fd8e7ee476ea7fc24f12986f254@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] git commit: Fix potential ConcurrentModificationException in tests Fix potential ConcurrentModificationException in tests Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39e3a5e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39e3a5e0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39e3a5e0 Branch: refs/heads/trunk Commit: 39e3a5e039a61e649827950bb36f67617e0bd884 Parents: eeb8d1b Author: Sylvain Lebresne Authored: Tue Nov 19 18:13:23 2013 +0100 Committer: Sylvain Lebresne Committed: Tue Nov 19 18:23:02 2013 +0100 ---------------------------------------------------------------------- .../apache/cassandra/locator/TokenMetadata.java | 22 +++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39e3a5e0/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 ac9a1d0..5ab1b3f 100644 --- a/src/java/org/apache/cassandra/locator/TokenMetadata.java +++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java @@ -876,13 +876,21 @@ public class TokenMetadata /** used by tests */ public void clearUnsafe() { - bootstrapTokens.clear(); - tokenToEndpointMap.clear(); - topology.clear(); - leavingEndpoints.clear(); - pendingRanges.clear(); - endpointToHostIdMap.clear(); - invalidateCaches(); + lock.writeLock().lock(); + try + { + bootstrapTokens.clear(); + tokenToEndpointMap.clear(); + topology.clear(); + leavingEndpoints.clear(); + pendingRanges.clear(); + endpointToHostIdMap.clear(); + invalidateCaches(); + } + finally + { + lock.writeLock().unlock(); + } } public String toString()