Updated Branches: refs/heads/1.5.1-SNAPSHOT 4cb92ca61 -> 78ba31d5a refs/heads/1.6.0-SNAPSHOT d8fd73e2a -> b4b0c0ee6 refs/heads/master 751803663 -> 2ed6fb83c
ACCUMULO-2344 interrupt the current thread when we catch the InterruptedException. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78ba31d5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78ba31d5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/78ba31d5 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 78ba31d5a12ca0ed6e346133e263c2f5a5cf2f57 Parents: 4cb92ca Author: Josh Elser <els...@apache.org> Authored: Mon Feb 10 11:25:32 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Feb 10 11:25:32 2014 -0500 ---------------------------------------------------------------------- .../accumulo/core/client/impl/TabletServerBatchReaderIterator.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/78ba31d5/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 200f38d..24719ae 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 @@ -310,6 +310,8 @@ public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value try { Thread.sleep(failSleepTime); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + // We were interrupted (close called on batchscanner) just exit log.debug("Exiting failure processing on interrupt"); return;
