You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/03/21 03:13:12 UTC
[09/25] git commit: ACCUMULO-2061 Only append a trailing slash when
one doesn't exist on the base dir
ACCUMULO-2061 Only append a trailing slash when one doesn't exist on the base dir
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/492768d3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/492768d3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/492768d3
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 492768d38221af64b71ba37bb8979d7bb841e738
Parents: 7d48b1a
Author: Josh Elser <el...@apache.org>
Authored: Wed Mar 12 16:25:19 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Mar 20 18:59:19 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/file/rfile/PrintInfo.java | 2 +-
.../org/apache/accumulo/core/volume/VolumeConfiguration.java | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/492768d3/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
index 7c0f067..7ed8f34 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
@@ -52,7 +52,7 @@ public class PrintInfo {
@SuppressWarnings("deprecation")
AccumuloConfiguration aconf = AccumuloConfiguration.getSiteConfiguration();
- // TODO This will only work for RFiles in HDFS when the filesystem is defined in the core-site.xml
+ // TODO ACCUMULO-2462 This will only work for RFiles in HDFS when the filesystem is defined in the core-site.xml
// on the classpath if a path, and not a URI, is given
FileSystem hadoopFs = VolumeConfiguration.getDefaultVolume(conf, aconf).getFileSystem();
FileSystem localFs = FileSystem.getLocal(conf);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/492768d3/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java b/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
index 5db5bb2..71ad611 100644
--- a/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
@@ -123,7 +123,11 @@ public class VolumeConfiguration {
suffix = suffix.substring(1);
String result[] = new String[bases.length];
for (int i = 0; i < bases.length; i++) {
- result[i] = bases[i] + "/" + suffix;
+ if (bases[i].endsWith("/")) {
+ result[i] = bases[i] + suffix;
+ } else {
+ result[i] = bases[i] + "/" + suffix;
+ }
}
return result;
}