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 DE9CE1092B for ; Sun, 9 Feb 2014 23:06:13 +0000 (UTC) Received: (qmail 67117 invoked by uid 500); 9 Feb 2014 23:06:10 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 67021 invoked by uid 500); 9 Feb 2014 23:06:09 -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 66976 invoked by uid 99); 9 Feb 2014 23:06:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Feb 2014 23:06:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8A7FB9214C7; Sun, 9 Feb 2014 23:06:08 +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: Sun, 09 Feb 2014 23:06:08 -0000 Message-Id: <8bed2525996b405c8d7ce756a4dd8cc4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] git commit: ACCUMULO-2344 Avoid usage of UtilWaitThread because we want to exit gracefully on interrupt. Updated Branches: refs/heads/1.5.1-SNAPSHOT d4b069996 -> 4cb92ca61 refs/heads/1.6.0-SNAPSHOT 4b51dd05e -> d8fd73e2a refs/heads/master 012efd72d -> 751803663 ACCUMULO-2344 Avoid usage of UtilWaitThread because we want to exit gracefully on interrupt. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4cb92ca6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4cb92ca6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4cb92ca6 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 4cb92ca616fb2aeaa80b0c5b7d004b6e8b39aa6d Parents: d4b0699 Author: Josh Elser Authored: Sun Feb 9 17:52:16 2014 -0500 Committer: Josh Elser Committed: Sun Feb 9 17:52:16 2014 -0500 ---------------------------------------------------------------------- .../core/client/impl/TabletServerBatchReaderIterator.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4cb92ca6/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java ---------------------------------------------------------------------- diff --git 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 index 2ecf3b7..200f38d 100644 --- 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 @@ -307,7 +307,14 @@ public class TabletServerBatchReaderIterator implements Iterator>> binnedRanges = new HashMap>>();