Repository: phoenix Updated Branches: refs/heads/4.0 8f4d45026 -> f976015ad
PHOENIX-1429 Cancel queued threads when limit reached Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f976015a Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f976015a Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f976015a Branch: refs/heads/4.0 Commit: f976015ad79314949b25755e0218c0665d93fd86 Parents: 8f4d450 Author: James Taylor <[email protected]> Authored: Wed Nov 12 11:59:52 2014 -0800 Committer: James Taylor <[email protected]> Committed: Wed Nov 12 11:59:52 2014 -0800 ---------------------------------------------------------------------- .../org/apache/phoenix/iterate/MergeSortResultIterator.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/f976015a/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortResultIterator.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortResultIterator.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortResultIterator.java index a837d8d..9ef3e70 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortResultIterator.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/MergeSortResultIterator.java @@ -64,6 +64,12 @@ public abstract class MergeSortResultIterator implements PeekingResultIterator { if (iterators != null) { SQLCloseables.closeAll(iterators); } + } catch (Exception e) { + if (toThrow == null) { + toThrow = ServerUtil.parseServerException(e); + } else { + toThrow.setNextException(ServerUtil.parseServerException(e)); + } } finally { if (toThrow != null) { throw toThrow;
