From 7ddaccdd61d9a0ef30be4e5072f386c191bcb543 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Thu, 23 Jul 2009 21:43:02 +0000
Subject: [PATCH] HBASE-1215 migration; fixes for jgray -- make
 HStoreFileToStoreFile implement Tool so can pass params

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@797236 13f79535-47bb-0310-9956-ffa450edef68
---
 .../hbase/migration/nineteen/HStoreFileToStoreFile.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java b/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java
index 8f7f568411e..7fc3ad58507 100644
--- a/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java
+++ b/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java
@@ -133,9 +133,10 @@ public class HStoreFileToStoreFile extends Configured implements Tool {
           // look in the 'mapfile' subdir.
           Path mfsdir = new Path(family, "mapfiles");
           FileStatus [] familyStatus = fs.listStatus(mfsdir);
-          if (familyStatus.length > 1) {
-            LOG.warn(family.toString() + " has " + familyStatus.length +
-            " files.  Continuing...");
+          if (familyStatus == null || familyStatus.length > 1) {
+            LOG.warn(family.toString() + " has " +
+              ((familyStatus == null) ? "null": familyStatus.length) +
+              " files.  Continuing...");
             continue;
           }
           if (familyStatus.length == 1) {