Apache/hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-13199 ADDENDUM Some small improvements on canary tool (Shaohui Liu)

Browse Source
This commit is contained in:
Liu Shaohui 2015-03-20 15:22:14 -05:00 committed by Sean Busbey
parent 6d4460341e
commit f4eb7191be
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
View File

@ -153,14 +153,13 @@ public final class Canary implements Tool {
} catch (IOException e) { } catch (IOException e) {
LOG.debug("sniffRegion failed", e); LOG.debug("sniffRegion failed", e);
sink.publishReadFailure(region, e); sink.publishReadFailure(region, e);
return null;
} finally {
if (table != null) { if (table != null) {
try { try {
table.close(); table.close();
} catch (IOException e) { } catch (IOException ioe) {
} }
} }
return null;
} }
byte[] startKey = null; byte[] startKey = null;
@ -204,17 +203,15 @@ public final class Canary implements Tool {
if (rs != null) { if (rs != null) {
rs.close(); rs.close();
} }
if (table != null) {
try {
table.close();
} catch (IOException e) {
}
}
scan = null; scan = null;
get = null; get = null;
startKey = null; startKey = null;
} }
} }
try {
table.close();
} catch (IOException e) {
}
return null; return null;
} }
} }