Repository: phoenix Updated Branches: refs/heads/4.0 6e820828b -> 5aa8d4059
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/5aa8d405 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5aa8d405 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5aa8d405 Branch: refs/heads/4.0 Commit: 5aa8d405971911e393535fc85571fd1c6bd84650 Parents: 6e82082 Author: James Taylor <[email protected]> Authored: Tue Sep 16 13:30:04 2014 -0700 Committer: James Taylor <[email protected]> Committed: Tue Sep 16 13:31:07 2014 -0700 ---------------------------------------------------------------------- .../coprocessor/UngroupedAggregateRegionObserver.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/5aa8d405/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 1c6affa..95b095e 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,11 +345,11 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver } } while (hasMore); } finally { - try { - innerScanner.close(); - } finally { - region.closeRegionOperation(); - } + try { + innerScanner.close(); + } finally { + region.closeRegionOperation(); + } } if (logger.isInfoEnabled()) {
