KYLIN-1638 Unclosed HBaseAdmin in ToolUtil#getHBaseMetaStoreId()

Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/96dc57bc
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/96dc57bc
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/96dc57bc

Branch: refs/heads/1.5.x-HBase1.x
Commit: 96dc57bc7f96ed320ce461b3bb1bbea33b0b1737
Parents: 2ab68ed
Author: lidongsjtu <lid...@apache.org>
Authored: Sat Apr 30 10:04:00 2016 +0800
Committer: lidongsjtu <lid...@apache.org>
Committed: Sat Apr 30 10:04:00 2016 +0800

----------------------------------------------------------------------
 tool/src/main/java/org/apache/kylin/tool/ToolUtil.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/96dc57bc/tool/src/main/java/org/apache/kylin/tool/ToolUtil.java
----------------------------------------------------------------------
diff --git a/tool/src/main/java/org/apache/kylin/tool/ToolUtil.java 
b/tool/src/main/java/org/apache/kylin/tool/ToolUtil.java
index 021f171..982e388 100644
--- a/tool/src/main/java/org/apache/kylin/tool/ToolUtil.java
+++ b/tool/src/main/java/org/apache/kylin/tool/ToolUtil.java
@@ -46,9 +46,10 @@ public class ToolUtil {
     }
 
     public static String getHBaseMetaStoreId() throws IOException {
-        final HBaseAdmin hbaseAdmin = new 
HBaseAdmin(HBaseConfiguration.create(HadoopUtil.getCurrentConfiguration()));
-        final String metaStoreName = 
KylinConfig.getInstanceFromEnv().getMetadataUrlPrefix();
-        final HTableDescriptor desc = 
hbaseAdmin.getTableDescriptor(TableName.valueOf(metaStoreName));
-        return "MetaStore UUID: " + 
desc.getValue(HBaseConnection.HTABLE_UUID_TAG);
+        try (final HBaseAdmin hbaseAdmin = new 
HBaseAdmin(HBaseConfiguration.create(HadoopUtil.getCurrentConfiguration()))) {
+            final String metaStoreName = 
KylinConfig.getInstanceFromEnv().getMetadataUrlPrefix();
+            final HTableDescriptor desc = 
hbaseAdmin.getTableDescriptor(TableName.valueOf(metaStoreName));
+            return "MetaStore UUID: " + 
desc.getValue(HBaseConnection.HTABLE_UUID_TAG);
+        }
     }
 }

Reply via email to