Updated Branches: refs/heads/master 72fdef3d5 -> c2dee4be5
ACCUMULO-1481 broke binary compatibility with hadoop-1.2.0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c2dee4be Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c2dee4be Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c2dee4be Branch: refs/heads/master Commit: c2dee4be5253b8c2f73a00068ab218b6ffc09bc8 Parents: 72fdef3 Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Oct 29 09:21:01 2013 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Oct 29 09:21:08 2013 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/master/Master.java | 2 +- .../java/org/apache/accumulo/server/util/Initialize.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c2dee4be/server/src/main/java/org/apache/accumulo/server/master/Master.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/Master.java b/server/src/main/java/org/apache/accumulo/server/master/Master.java index 2c19b6f..c029ae5 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/Master.java +++ b/server/src/main/java/org/apache/accumulo/server/master/Master.java @@ -305,7 +305,7 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt try { Path oldDir = fs.getFullPath(FileType.TABLE, ServerConstants.getDefaultBaseDir() + "/tables/!0/root_tablet"); for (FileStatus file : fs.listStatus(oldDir)) { - if (file.isFile()) { + if (fs.isFile(file.getPath())) { Path newFile = new Path(ServerConstants.getRootTabletDir(), file.getPath().getName()); FileUtil.copy( fs.getFileSystemByPath(file.getPath()), file.getPath(), http://git-wip-us.apache.org/repos/asf/accumulo/blob/c2dee4be/server/src/main/java/org/apache/accumulo/server/util/Initialize.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java index 3f6ef19..6562595 100644 --- a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java +++ b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java @@ -237,7 +237,7 @@ public class Initialize { for (Path mtd : metadataTableDirs) { try { fstat = fs.getFileStatus(mtd); - if (!fstat.isDirectory()) { + if (!fstat.isDir()) { log.fatal("location " + mtd.toString() + " exists but is not a directory"); return; } @@ -252,7 +252,7 @@ public class Initialize { // create root table and tablet try { fstat = fs.getFileStatus(rootTablet); - if (!fstat.isDirectory()) { + if (!fstat.isDir()) { log.fatal("location " + rootTablet.toString() + " exists but is not a directory"); return; } @@ -313,14 +313,14 @@ public class Initialize { Path dir = new Path(s); try { fstat = fs.getFileStatus(dir); - if (!fstat.isDirectory()) { + if (!fstat.isDir()) { log.fatal("location " + dir.toString() + " exists but is not a directory"); return; } } catch (FileNotFoundException fnfe) { try { fstat = fs.getFileStatus(dir); - if (!fstat.isDirectory()) { + if (!fstat.isDir()) { log.fatal("location " + dir.toString() + " exists but is not a directory"); return; }
