join-paths function added and used instead of str in storage.clj

Frostman · Frostman · commit 94098fb76bc9 · 2012-12-03T14:08:44.000+04:00
diff --git a/src/clj/backtype/storm/nimbus/storage.clj b/src/clj/backtype/storm/nimbus/storage.clj
@@ -11,21 +11,21 @@
     (log-message "Using default storage (" stormroot ")")
     (reify INimbusStorage
       (^InputStream open [this, ^String path]
-        (FileInputStream. (str stormroot path)))
+        (FileInputStream. (join-paths stormroot path)))
 
       (^OutputStream create [this, ^String path]
-        (FileOutputStream. (str stormroot path)))
+        (FileOutputStream. (join-paths stormroot path)))
 
       (^List list [this, ^String path]
-        (seq (.list (File. (str stormroot path)))))
+        (seq (.list (File. (join-paths stormroot path)))))
 
       (^void delete [this, ^String path]
-        (let [full-path (str stormroot path)]
+        (let [full-path (join-paths stormroot path)]
           (when (exists-file? full-path)
             (FileUtils/forceDelete (File. full-path)))))
 
       (^void mkdirs [this, ^String path]
-        (FileUtils/forceMkdir (File. (str stormroot path))))
+        (FileUtils/forceMkdir (File. (join-paths stormroot path))))
 
       (^boolean isSupportDistributed [this]
         false))))
diff --git a/src/clj/backtype/storm/util.clj b/src/clj/backtype/storm/util.clj
@@ -813,3 +813,14 @@
   (let [klass (if (string? klass) (Class/forName klass) klass)]
     (.newInstance klass)
     ))
+
+(defn join-paths [^String left ^String right]
+  (let [l-slash (= \/ (last left))
+        r-slash (= \/ (first right))]
+    (if (and l-slash r-slash)
+      (let [right (.substring right 1)]
+        (str left right))
+      (if-not (or l-slash r-slash)
+        (str left "/" right)
+        (str left right)))))
+
