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


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

Branch: refs/heads/3.0
Commit: a2d8b52977b68f60126ca00086142c0493441170
Parents: 47e9cc1
Author: James Taylor <jamestay...@apache.org>
Authored: Tue Sep 16 13:30:04 2014 -0700
Committer: James Taylor <jamestay...@apache.org>
Committed: Tue Sep 16 13:30:04 2014 -0700

----------------------------------------------------------------------
 .../coprocessor/UngroupedAggregateRegionObserver.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


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

Reply via email to