git commit: PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong)

2014-09-16 Thread jamestaylor
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 jamestay...@apache.org
Authored: Tue Sep 16 13:20:08 2014 -0700
Committer: James Taylor jamestay...@apache.org
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()) {



git commit: PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong)

2014-09-16 Thread jamestaylor
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()) {



git commit: PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong)

2014-09-16 Thread jamestaylor
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 jamestay...@apache.org
Authored: Tue Sep 16 13:30:04 2014 -0700
Committer: James Taylor jamestay...@apache.org
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()) {