You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by zh...@apache.org on 2016/01/28 18:49:55 UTC
[19/23] storm git commit: use URLEncoder.encode UTF-8
use URLEncoder.encode UTF-8
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/df51368d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/df51368d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/df51368d
Branch: refs/heads/master
Commit: df51368d6d24af12fbde351e77be330736514f24
Parents: c495266
Author: zhuol <zh...@yahoo-inc.com>
Authored: Wed Jan 20 17:38:37 2016 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Wed Jan 20 17:38:37 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/config.clj | 7 +------
storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java | 3 ++-
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/df51368d/storm-core/src/clj/org/apache/storm/config.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/config.clj b/storm-core/src/clj/org/apache/storm/config.clj
index fb13835..cb002ca 100644
--- a/storm-core/src/clj/org/apache/storm/config.clj
+++ b/storm-core/src/clj/org/apache/storm/config.clj
@@ -52,9 +52,4 @@
;; TODO this function together with sampling-rate are to be replaced with Java version when util.clj is in
(defn mk-stats-sampler
[conf]
- (even-sampler (sampling-rate conf)))
-
-;; TODO this function is to be replaced with Java version when util.clj is in
-(defn read-default-config
- []
- (clojurify-structure (Utils/readDefaultConfig)))
\ No newline at end of file
+ (even-sampler (sampling-rate conf)))
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/storm/blob/df51368d/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
index 766e0ca..0f3b310 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
@@ -34,6 +34,7 @@ import java.util.Map;
import java.util.Set;
import java.util.HashSet;
import java.util.Collections;
+import java.net.URLEncoder;
public class ConfigUtils {
private final static Logger LOG = LoggerFactory.getLogger(ConfigUtils.class);
@@ -299,7 +300,7 @@ public class ConfigUtils {
if (mockedSupervisorStormDistRoot != null) {
return null;
}
- return supervisorStormDistRoot(conf) + FILE_SEPARATOR + stormId; // TODO: need to (url-encode storm-id)? Not.
+ return supervisorStormDistRoot(conf) + FILE_SEPARATOR + URLEncoder.encode(stormId, "UTF-8");
}
public static String supervisorStormJarPath(String stormRoot) {