From 09e5007074592a074c1e22c78cc67abfc5021551 Mon Sep 17 00:00:00 2001 From: Yang Ming Date: Fri, 22 Jun 2018 19:34:25 +0800 Subject: [PATCH] HBASE-20532 Use try-with-resources in BackupSystemTable --- .../hbase/backup/impl/BackupSystemTable.java | 35 ++++++---------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java index 5e174ebc3d..1b3694425a 100644 --- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java +++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java @@ -1174,25 +1174,16 @@ public final class BackupSystemTable implements Closeable { LOG.trace("Backup set list"); List list = new ArrayList<>(); - Table table = null; - ResultScanner scanner = null; - try { - table = connection.getTable(tableName); + try (Table table = connection.getTable(tableName)) { Scan scan = createScanForBackupSetList(); scan.setMaxVersions(1); - scanner = table.getScanner(scan); - Result res; - while ((res = scanner.next()) != null) { - res.advance(); - list.add(cellKeyToBackupSetName(res.current())); - } - return list; - } finally { - if (scanner != null) { - scanner.close(); - } - if (table != null) { - table.close(); + try (ResultScanner scanner = table.getScanner(scan)) { + Result res; + while ((res = scanner.next()) != null) { + res.advance(); + list.add(cellKeyToBackupSetName(res.current())); + } + return list; } } } @@ -1207,24 +1198,16 @@ public final class BackupSystemTable implements Closeable { if (LOG.isTraceEnabled()) { LOG.trace(" Backup set describe: " + name); } - Table table = null; - try { - table = connection.getTable(tableName); + try (Table table = connection.getTable(tableName)) { Get get = createGetForBackupSet(name); Result res = table.get(get); - if (res.isEmpty()) { return null; } - res.advance(); String[] tables = cellValueToBackupSet(res.current()); return Arrays.asList(tables).stream().map(item -> TableName.valueOf(item)) .collect(Collectors.toList()); - } finally { - if (table != null) { - table.close(); - } } } -- 2.15.1 (Apple Git-101)