Repository: hbase Updated Branches: refs/heads/master ccb22bd80 -> 5ec5552be
HBASE-14115 Fix resource leak in HMasterCommandLine (Yuhao Bi) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5ec5552b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5ec5552b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5ec5552b Branch: refs/heads/master Commit: 5ec5552be0534dbf4b07ef6607741ae6f9ab0495 Parents: ccb22bd Author: tedyu <[email protected]> Authored: Tue Jul 21 09:18:59 2015 -0700 Committer: tedyu <[email protected]> Committed: Tue Jul 21 09:18:59 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/master/HMasterCommandLine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5ec5552b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java index cb32827..0407877 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java @@ -255,7 +255,7 @@ public class HMasterCommandLine extends ServerCommandLine { conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 1); try (Connection connection = ConnectionFactory.createConnection(conf)) { try (Admin admin = connection.getAdmin()) { - connection.getAdmin().shutdown(); + admin.shutdown(); } catch (Throwable t) { LOG.error("Failed to stop master", t); return 1;
