You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/01/17 02:33:49 UTC
svn commit: r1558975 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LabelExpander.java
Author: tedyu
Date: Fri Jan 17 01:33:49 2014
New Revision: 1558975
URL: http://svn.apache.org/r1558975
Log:
HBASE-10369 LabelExpander#createLabels() should close scanner in finally clause
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LabelExpander.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LabelExpander.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LabelExpander.java?rev=1558975&r1=1558974&r2=1558975&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LabelExpander.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LabelExpander.java Fri Jan 17 01:33:49 2014
@@ -140,13 +140,14 @@ public class LabelExpander {
// This scan should be done by user with global_admin previliges.. Ensure
// that it works
HTable visibilityLabelsTable = null;
+ ResultScanner scanner = null;
try {
labels = new HashMap<String, Integer>();
visibilityLabelsTable = new HTable(conf, LABELS_TABLE_NAME.getName());
Scan scan = new Scan();
scan.setAuthorizations(new Authorizations(VisibilityUtils.SYSTEM_LABEL));
scan.addColumn(LABELS_TABLE_FAMILY, LABEL_QUALIFIER);
- ResultScanner scanner = visibilityLabelsTable.getScanner(scan);
+ scanner = visibilityLabelsTable.getScanner(scan);
while (true) {
Result next = scanner.next();
if (next == null) {
@@ -156,10 +157,15 @@ public class LabelExpander {
byte[] value = next.getValue(LABELS_TABLE_FAMILY, LABEL_QUALIFIER);
labels.put(Bytes.toString(value), Bytes.toInt(row));
}
- scanner.close();
} finally {
- if (visibilityLabelsTable != null) {
- visibilityLabelsTable.close();
+ try {
+ if (scanner != null) {
+ scanner.close();
+ }
+ } finally {
+ if (visibilityLabelsTable != null) {
+ visibilityLabelsTable.close();
+ }
}
}
}