Return-Path: 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 7BA3D9A80 for ; Thu, 12 Apr 2012 18:34:44 +0000 (UTC) Received: (qmail 75329 invoked by uid 500); 12 Apr 2012 18:34:44 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 75312 invoked by uid 500); 12 Apr 2012 18:34:44 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 75304 invoked by uid 99); 12 Apr 2012 18:34:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Apr 2012 18:34:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Apr 2012 18:34:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 43EAF23888EA for ; Thu, 12 Apr 2012 18:34:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1325429 - /accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java Date: Thu, 12 Apr 2012 18:34:23 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120412183423.43EAF23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Thu Apr 12 18:34:22 2012 New Revision: 1325429 URL: http://svn.apache.org/viewvc?rev=1325429&view=rev Log: ACCUMULO-529 remove should have been removeAll Modified: accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java Modified: accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1325429&r1=1325428&r2=1325429&view=diff ============================================================================== --- accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java (original) +++ accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/master/Master.java Thu Apr 12 18:34:22 2012 @@ -1250,7 +1250,7 @@ public class Master implements Listener, synchronized (migrations) { notFound.addAll(migrations.keySet()); } - notFound.remove(found); + notFound.removeAll(found); for (KeyExtent extent : notFound) { log.info("Canceling migration of " + extent + " to " + migrations.get(extent) + ": tablet no longer exists (probably due to a split)"); migrations.remove(extent);