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 2166F183E1 for ; Wed, 13 Jan 2016 20:11:21 +0000 (UTC) Received: (qmail 14855 invoked by uid 500); 13 Jan 2016 20:11:21 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 14789 invoked by uid 500); 13 Jan 2016 20:11:21 -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 14705 invoked by uid 99); 13 Jan 2016 20:11:20 -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; Wed, 13 Jan 2016 20:11:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C1104E025B; Wed, 13 Jan 2016 20:11:20 +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 Date: Wed, 13 Jan 2016 20:11:22 -0000 Message-Id: In-Reply-To: <40ba944a359742be8dbd033f7a55e80b@git.apache.org> References: <40ba944a359742be8dbd033f7a55e80b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/6] accumulo git commit: ACCUMULO-3509 Fix a compiler warning. ACCUMULO-3509 Fix a compiler warning. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8c6866ef Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8c6866ef Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8c6866ef Branch: refs/heads/master Commit: 8c6866efbb40aa1732b79f99c92458f3e672d14a Parents: 29c6052 Author: Josh Elser Authored: Wed Jan 13 14:08:50 2016 -0500 Committer: Josh Elser Committed: Wed Jan 13 14:08:50 2016 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/tserver/TabletServer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c6866ef/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index b7aaf06..4e3e00b 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -923,15 +923,17 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu @Override public boolean cleanup() { + final boolean ret; try { if (nextBatchTask != null) nextBatchTask.cancel(true); } finally { if (scanner != null) - return scanner.close(); + ret = scanner.close(); else - return true; + ret = true; } + return ret; } }