You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/04/22 18:44:21 UTC
[2/6] git commit: Move command line options values introspection
logic to Utils#readCommandLineOpts (STORM-173)
Move command line options values introspection logic to
Utils#readCommandLineOpts (STORM-173)
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/442d8e75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/442d8e75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/442d8e75
Branch: refs/heads/master
Commit: 442d8e75103f425d211a022184621072326925f0
Parents: c4ff804
Author: Danijel Schiavuzzi <da...@infobip.com>
Authored: Wed Apr 16 18:01:34 2014 +0200
Committer: Danijel Schiavuzzi <da...@infobip.com>
Committed: Wed Apr 16 18:01:34 2014 +0200
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/StormSubmitter.java | 6 ------
storm-core/src/jvm/backtype/storm/utils/Utils.java | 10 +++++++++-
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/442d8e75/storm-core/src/jvm/backtype/storm/StormSubmitter.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/StormSubmitter.java b/storm-core/src/jvm/backtype/storm/StormSubmitter.java
index c7305de..5ef372f 100644
--- a/storm-core/src/jvm/backtype/storm/StormSubmitter.java
+++ b/storm-core/src/jvm/backtype/storm/StormSubmitter.java
@@ -81,12 +81,6 @@ public class StormSubmitter {
}
stormConf = new HashMap(stormConf);
stormConf.putAll(Utils.readCommandLineOpts());
- for (Object confName : stormConf.keySet()) {
- String confValue = String.valueOf(stormConf.get(confName));
- if (NumberUtils.isNumber(confValue)) {
- stormConf.put(confName, NumberUtils.createNumber(confValue));
- }
- }
Map conf = Utils.readStormConfig();
conf.putAll(stormConf);
try {
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/442d8e75/storm-core/src/jvm/backtype/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/Utils.java b/storm-core/src/jvm/backtype/storm/utils/Utils.java
index 7979e4b..bc0ba7e 100644
--- a/storm-core/src/jvm/backtype/storm/utils/Utils.java
+++ b/storm-core/src/jvm/backtype/storm/utils/Utils.java
@@ -23,9 +23,11 @@ import backtype.storm.generated.ComponentObject;
import backtype.storm.generated.StormTopology;
import clojure.lang.IFn;
import clojure.lang.RT;
+
import com.netflix.curator.framework.CuratorFramework;
import com.netflix.curator.framework.CuratorFrameworkFactory;
import com.netflix.curator.retry.ExponentialBackoffRetry;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileOutputStream;
@@ -47,7 +49,9 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.UUID;
+
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
import org.apache.thrift.TException;
import org.json.simple.JSONValue;
import org.yaml.snakeyaml.Yaml;
@@ -170,7 +174,11 @@ public class Utils {
for (String config : configs) {
String[] options = config.split("=");
if (options.length == 2) {
- ret.put(options[0], options[1]);
+ Object confValue = options[1];
+ if (NumberUtils.isNumber(options[1])) {
+ confValue = NumberUtils.createNumber(String.valueOf(confValue));
+ }
+ ret.put(options[0], confValue);
}
}
}