Repository: phoenix Updated Branches: refs/heads/4.0 c2712bf2b -> 6e820828b
PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6e820828 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6e820828 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6e820828 Branch: refs/heads/4.0 Commit: 6e820828bbe1d05f8da9f502c7b4e08a5ccae8e3 Parents: c2712bf Author: James Taylor <[email protected]> Authored: Tue Sep 16 13:20:08 2014 -0700 Committer: James Taylor <[email protected]> Committed: Tue Sep 16 13:20:08 2014 -0700 ---------------------------------------------------------------------- .../phoenix/coprocessor/UngroupedAggregateRegionObserver.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6e820828/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java index 9878777..1c6affa 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java @@ -345,8 +345,11 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver } } while (hasMore); } finally { + try { innerScanner.close(); + } finally { region.closeRegionOperation(); + } } if (logger.isInfoEnabled()) {
