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 E4A566545 for ; Tue, 19 Jul 2011 03:39:40 +0000 (UTC) Received: (qmail 63419 invoked by uid 500); 19 Jul 2011 03:39:40 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 63114 invoked by uid 500); 19 Jul 2011 03:39:25 -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 63034 invoked by uid 99); 19 Jul 2011 03:39:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jul 2011 03:39:18 +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; Tue, 19 Jul 2011 03:39:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 04C60238885D for ; Tue, 19 Jul 2011 03:38:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1148138 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Date: Tue, 19 Jul 2011 03:38:54 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110719033855.04C60238885D@eris.apache.org> Author: tedyu Date: Tue Jul 19 03:38:53 2011 New Revision: 1148138 URL: http://svn.apache.org/viewvc?rev=1148138&view=rev Log: HBASE-4112 Creating table may throw NullPointerException (Jinchao via Ted Yu) Modified: hbase/trunk/CHANGES.txt hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Modified: hbase/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1148138&r1=1148137&r2=1148138&view=diff ============================================================================== --- hbase/trunk/CHANGES.txt (original) +++ hbase/trunk/CHANGES.txt Tue Jul 19 03:38:53 2011 @@ -163,6 +163,7 @@ Release 0.91.0 - Unreleased HBASE-4087 HBaseAdmin should perform validation of connection it holds HBASE-4052 Enabling a table after master switch does not allow table scan, throwing NotServingRegionException (ramkrishna via Ted Yu) + HBASE-4112 Creating table may throw NullPointerException (Jinchao via Ted Yu) IMPROVEMENTS HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack) Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1148138&r1=1148137&r2=1148138&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Tue Jul 19 03:38:53 2011 @@ -360,9 +360,13 @@ public class HBaseAdmin implements Abort MetaScannerVisitor visitor = new MetaScannerVisitor() { @Override public boolean processRow(Result rowResult) throws IOException { - HRegionInfo info = Writables.getHRegionInfo( + HRegionInfo info = Writables.getHRegionInfoOrNull( rowResult.getValue(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER)); + //If regioninfo is null, skip this row + if (null == info) { + return true; + } if (!(Bytes.equals(info.getTableName(), desc.getName()))) { return false; }