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 CECD11057E for ; Wed, 2 Oct 2013 07:52:08 +0000 (UTC) Received: (qmail 84260 invoked by uid 500); 2 Oct 2013 07:52:02 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 84237 invoked by uid 500); 2 Oct 2013 07:51:59 -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 84225 invoked by uid 99); 2 Oct 2013 07:51:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Oct 2013 07:51:56 +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; Wed, 02 Oct 2013 07:51:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7572D2388868; Wed, 2 Oct 2013 07:51:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1528331 - /hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java Date: Wed, 02 Oct 2013 07:51:33 -0000 To: commits@hbase.apache.org From: rajeshbabu@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131002075133.7572D2388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajeshbabu Date: Wed Oct 2 07:51:33 2013 New Revision: 1528331 URL: http://svn.apache.org/r1528331 Log: HBASE-9697 ZKDataMigrator should exit on table(s) null check. Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java?rev=1528331&r1=1528330&r2=1528331&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java (original) +++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ZKDataMigrator.java Wed Oct 2 07:51:33 2013 @@ -135,6 +135,7 @@ public class ZKDataMigrator extends Conf List tables = ZKUtil.listChildrenNoWatch(zkw, zkw.tableZNode); if (tables == null) { LOG.info("No table present to migrate table state to PB. returning.."); + return; } for (String table : tables) { String znode = ZKUtil.joinZNode(zkw.tableZNode, table); @@ -159,6 +160,7 @@ public class ZKDataMigrator extends Conf List replicationZnodes = ZKUtil.listChildrenNoWatch(zkw, replicationPath); if (replicationZnodes == null) { LOG.info("No replication related znodes present to migrate. returning.."); + return; } for (String child : replicationZnodes) { String znode = ZKUtil.joinZNode(replicationPath, child);