Return-Path: 
 <commits-return-14711-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-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 06168107E0
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Tue, 24 Feb 2015 03:07:40 +0000 (UTC)
Received: (qmail 20735 invoked by uid 500); 24 Feb 2015 03:07:39 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 20690 invoked by uid 500); 24 Feb 2015 03:07:39 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 20681 invoked by uid 99); 24 Feb 2015 03:07:39 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Feb 2015 03:07:39 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id B86E1E0388; Tue, 24 Feb 2015 03:07:39 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: elserj@apache.org
To: commits@accumulo.apache.org
Message-Id: <8c562fbe91594da387c7296d44974480@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: accumulo git commit: ACCUMULO-3601 Synchronize on map while copying
 keyset
Date: Tue, 24 Feb 2015 03:07:39 +0000 (UTC)

Repository: accumulo
Updated Branches:
  refs/heads/master ae7c2d257 -> fb5410a04


ACCUMULO-3601 Synchronize on map while copying keyset

Prevents ConcurrentModificationException.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fb5410a0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fb5410a0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fb5410a0

Branch: refs/heads/master
Commit: fb5410a0468e65067fcfae20c2bd6ae607f9e7ce
Parents: ae7c2d2
Author: Josh Elser <elserj@apache.org>
Authored: Mon Feb 23 22:06:38 2015 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Feb 23 22:06:38 2015 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/accumulo/master/Master.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5410a0/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 81339ad..9277d8b 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -1534,6 +1534,10 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List
 
   @Override
   public Collection<KeyExtent> migrations() {
-    return migrations.keySet();
+    Set<KeyExtent> migrationKeys = new HashSet<KeyExtent>();
+    synchronized (migrations) {
+      migrationKeys.addAll(migrations.keySet());
+    }
+    return migrationKeys;
   }
 }