accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [11/26] git commit: ACCUMULO-2061 Only append a trailing slash when one doesn't exist on the base dir
Date Fri, 14 Mar 2014 21:11:37 GMT
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/4b8a14e3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4b8a14e3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4b8a14e3

Branch: refs/heads/ACCUMULO-2061
Commit: 4b8a14e38734acb5b8b89c1e1f48acc680b246ac
Parents: 560af51
Author: Josh Elser <elserj@apache.org>
Authored: Wed Mar 12 16:25:19 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Wed Mar 12 16:25:19 2014 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/core/volume/VolumeConfiguration.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4b8a14e3/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;
   }


Mime
View raw message