ACCUMULO-2061 Core module builds now
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43a7ebda Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43a7ebda Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43a7ebda Branch: refs/heads/ACCUMULO-2061 Commit: 43a7ebda2d02e7482efe1717cabddf2317c2d7b0 Parents: ce32e3e Author: Josh Elser <els...@apache.org> Authored: Fri Mar 7 15:52:23 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Mar 7 15:52:23 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/core/client/admin/TableOperationsImpl.java | 2 +- core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/43a7ebda/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java index d89ad99..9d033e2 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java @@ -1139,7 +1139,7 @@ public class TableOperationsImpl extends TableOperationsHelper { @SuppressWarnings("deprecation") private Path checkPath(String dir, String kind, String type) throws IOException, AccumuloException { Path ret; - FileSystem fs = VolumeConfiguration.getFileSystem(dir, CachedConfiguration.getInstance(), ServerConfigurationUtil.getConfiguration(instance)); + FileSystem fs = VolumeConfiguration.getVolume(dir, CachedConfiguration.getInstance(), ServerConfigurationUtil.getConfiguration(instance)).getFileSystem(); if (dir.contains(":")) { ret = new Path(dir); http://git-wip-us.apache.org/repos/asf/accumulo/blob/43a7ebda/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java b/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java index 97518c5..d536f42 100644 --- a/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java @@ -49,7 +49,7 @@ public class ZooUtil extends org.apache.accumulo.fate.zookeeper.ZooUtil { public static String getInstanceIDFromHdfs(Path instanceDirectory, AccumuloConfiguration conf) { try { - FileSystem fs = VolumeConfiguration.getFileSystem(instanceDirectory.toString(), CachedConfiguration.getInstance(), conf); + FileSystem fs = VolumeConfiguration.getVolume(instanceDirectory.toString(), CachedConfiguration.getInstance(), conf).getFileSystem(); FileStatus[] files = null; try { files = fs.listStatus(instanceDirectory);
