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 319CE1807E for ; Thu, 31 Dec 2015 01:45:05 +0000 (UTC) Received: (qmail 63637 invoked by uid 500); 31 Dec 2015 01:45:05 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 63512 invoked by uid 500); 31 Dec 2015 01:45:05 -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 63337 invoked by uid 99); 31 Dec 2015 01:45: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, 31 Dec 2015 01:45:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AC8CFE0914; Thu, 31 Dec 2015 01:45:04 +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: Thu, 31 Dec 2015 01:45:10 -0000 Message-Id: <8335d94f23ff4097acf0aeb47adb2120@git.apache.org> In-Reply-To: <8456c42290da4d90ab25482b2c2aab97@git.apache.org> References: <8456c42290da4d90ab25482b2c2aab97@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/9] accumulo git commit: Merge branch '1.6' into 1.7 Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e4ccbbfe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e4ccbbfe Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e4ccbbfe Branch: refs/heads/1.7 Commit: e4ccbbfe9753c5d3a81e11616bdd49d7ecc758c3 Parents: 76d9ed7 7aaecbb Author: Josh Elser Authored: Wed Dec 30 20:30:38 2015 -0500 Committer: Josh Elser Committed: Wed Dec 30 20:30:38 2015 -0500 ---------------------------------------------------------------------- .../client/impl/TabletServerBatchReaderIterator.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e4ccbbfe/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java index 2a0e1d8,64ccac1..053f2b3 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java @@@ -355,12 -383,14 +355,14 @@@ public class TabletServerBatchReaderIte } } catch (IOException e) { - synchronized (failures) { - failures.putAll(tsFailures); - failures.putAll(unscanned); - } + if (!TabletServerBatchReaderIterator.this.queryThreadPool.isShutdown()) { + synchronized (failures) { + failures.putAll(tsFailures); + failures.putAll(unscanned); + } - locator.invalidateCache(context.getInstance(), tsLocation); - locator.invalidateCache(tsLocation); ++ locator.invalidateCache(context.getInstance(), tsLocation); + } log.debug(e.getMessage(), e); } catch (AccumuloSecurityException e) { e.setTableInfo(getTableInfo());