Permalink
Browse files

Merge branch 'master' into ui-url

  • Loading branch information...
2 parents d20a7a3 + 4762dd3 commit 8cf23578728fdee421a838965c285d10ffcee722 @nathanmarz committed Mar 4, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/clj/backtype/storm/config.clj
  2. +1 −1 src/clj/backtype/storm/daemon/supervisor.clj
@@ -103,7 +103,7 @@
(defn supervisor-stormdist-root
([conf] (str (supervisor-local-dir conf) "/stormdist"))
([conf storm-id]
- (str (supervisor-stormdist-root conf) "/" storm-id)))
+ (str (supervisor-stormdist-root conf) "/" (java.net.URLEncoder/encode storm-id))))
(defn supervisor-stormjar-path [stormroot]
(str stormroot "/stormjar.jar"))
@@ -56,7 +56,7 @@
(defn- read-downloaded-storm-ids [conf]
- (read-dir-contents (supervisor-stormdist-root conf))
+ (map #(java.net.URLDecoder/decode %) (read-dir-contents (supervisor-stormdist-root conf)))
)
(defn read-worker-heartbeat [conf id]

0 comments on commit 8cf2357

Please sign in to comment.