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 4E31F17FC5 for ; Thu, 21 May 2015 18:02:04 +0000 (UTC) Received: (qmail 95472 invoked by uid 500); 21 May 2015 18:02:04 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 95437 invoked by uid 500); 21 May 2015 18:02:04 -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 95428 invoked by uid 99); 21 May 2015 18:02:04 -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; Thu, 21 May 2015 18:02:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 168DBE51AF; Thu, 21 May 2015 18:02:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Message-Id: <7bcacd98f7f74f269d5452677bd89c3b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: accumulo git commit: ACCUMULO-3423 fix embarassing findbugs problem Date: Thu, 21 May 2015 18:02:04 +0000 (UTC) Repository: accumulo Updated Branches: refs/heads/master 47d1a4db4 -> 2e10749a7 ACCUMULO-3423 fix embarassing findbugs problem Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2e10749a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2e10749a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2e10749a Branch: refs/heads/master Commit: 2e10749a790ab296590edfbd3204e8610f6bc223 Parents: 47d1a4d Author: Eric Newton Authored: Thu May 21 14:01:44 2015 -0400 Committer: Eric Newton Committed: Thu May 21 14:01:44 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/log/WalStateManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e10749a/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java b/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java index 32f3cbe..1540938 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java +++ b/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java @@ -153,9 +153,10 @@ public class WalStateManager { try { String path = root(); for (String child : zoo.getChildren(path)) { - List logs = result.get(child); + TServerInstance inst = new TServerInstance(child); + List logs = result.get(inst); if (logs == null) { - result.put(new TServerInstance(child), logs = new ArrayList<>()); + result.put(inst, logs = new ArrayList<>()); } for (String idString : zoo.getChildren(path + "/" + child)) { logs.add(UUID.fromString(idString));