You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/06/10 03:00:14 UTC
[20/28] storm git commit: STORM-853 Handles no topologyMainClassArgs
presented
STORM-853 Handles no topologyMainClassArgs presented
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fb5fe34f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fb5fe34f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fb5fe34f
Branch: refs/heads/0.10.x-branch
Commit: fb5fe34f55fdc7e6299d2de406ae9dd28760a10d
Parents: edd9bab
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Jun 6 13:55:29 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Jun 6 13:55:29 2015 +0900
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fb5fe34f/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index 7fcdb47..eee90f1 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -525,8 +525,9 @@
storm-cmd (str storm-home file-path-separator "bin" file-path-separator "storm")
tplg-cmd-response (apply sh
(flatten
- [storm-cmd "jar" tplg-jar-file tplg-main-class tplg-main-class-args
- (if (not= user "unknown") (str "-c storm.doAsUser=" user) "")]))]
+ [storm-cmd "jar" tplg-jar-file tplg-main-class
+ (if (not-nil? tplg-main-class-args) tplg-main-class-args [])
+ (if (not= user "unknown") (str "-c storm.doAsUser=" user) [])]))]
(log-message "tplg-cmd-response " tplg-cmd-response)
(cond
(= (tplg-cmd-response :exit) 0) {"status" "success"}