Repository: phoenix
Updated Branches:
  refs/heads/3.0 b51318d09 -> 47e9cc102


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/47e9cc10
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/47e9cc10
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/47e9cc10

Branch: refs/heads/3.0
Commit: 47e9cc102431ff21072320a46c692d0f2df05622
Parents: b51318d
Author: James Taylor <jamestay...@apache.org>
Authored: Tue Sep 16 13:20:08 2014 -0700
Committer: James Taylor <jamestay...@apache.org>
Committed: Tue Sep 16 13:27:12 2014 -0700

----------------------------------------------------------------------
 .../phoenix/coprocessor/UngroupedAggregateRegionObserver.java     | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/47e9cc10/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 566ec67..376531b 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
@@ -274,8 +274,11 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
                 }
             } while (hasMore);
         } finally {
+          try {
             innerScanner.close();
+          } finally {
             region.closeRegionOperation();
+          }
         }
         
         if (logger.isInfoEnabled()) {

Reply via email to