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
This commit is contained in:
Michael Stack 2009-07-23 21:43:02 +00:00
parent 97b6100e54
commit 7ddaccdd61
1 changed files with 4 additions and 3 deletions

View File

@ -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) {