Repository: phoenix Updated Branches: refs/heads/master 1510cd2d2 -> a6538d792
PHOENIX-1409 Close HBaseAdmin in ConnectionQueryServicesImpl#modifyTable Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a6538d79 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a6538d79 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a6538d79 Branch: refs/heads/master Commit: a6538d79266ff5d3c0a12773669a29ea6f71dca7 Parents: 1510cd2 Author: Samarth <[email protected]> Authored: Fri Jan 9 15:56:58 2015 -0800 Committer: Samarth <[email protected]> Committed: Fri Jan 9 15:56:58 2015 -0800 ---------------------------------------------------------------------- .../query/ConnectionQueryServicesImpl.java | 21 ++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a6538d79/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java index 17e9ae1..6de245e 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java @@ -971,16 +971,17 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement @Override public void modifyTable(byte[] tableName, HTableDescriptor newDesc) throws IOException, - InterruptedException, TimeoutException { - HBaseAdmin admin = new HBaseAdmin(config); - if (!allowOnlineTableSchemaUpdate()) { - admin.disableTable(tableName); - admin.modifyTable(tableName, newDesc); - admin.enableTable(tableName); - } else { - admin.modifyTable(tableName, newDesc); - pollForUpdatedTableDescriptor(admin, newDesc, tableName); - } + InterruptedException, TimeoutException { + try (HBaseAdmin admin = new HBaseAdmin(config)) { + if (!allowOnlineTableSchemaUpdate()) { + admin.disableTable(tableName); + admin.modifyTable(tableName, newDesc); + admin.enableTable(tableName); + } else { + admin.modifyTable(tableName, newDesc); + pollForUpdatedTableDescriptor(admin, newDesc, tableName); + } + } } private static boolean isInvalidMutableIndexConfig(Long serverVersion) {
