Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D478510DDF for ; Fri, 17 Jan 2014 01:34:12 +0000 (UTC) Received: (qmail 64741 invoked by uid 500); 17 Jan 2014 01:34:12 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 64660 invoked by uid 500); 17 Jan 2014 01:34:11 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 64647 invoked by uid 99); 17 Jan 2014 01:34:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jan 2014 01:34:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jan 2014 01:34:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 92AAB23889FD; Fri, 17 Jan 2014 01:33:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1558975 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/LabelExpander.java Date: Fri, 17 Jan 2014 01:33:49 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140117013349.92AAB23889FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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(); 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(); + } } } }