commit ab08cb246050cd940c3f3f4623fb2e8e2361aa41
author P. Taylor Goetz <ptgoetz@gmail.com> Fri Sep 27 07:32:56 2013 -0700
committer P. Taylor Goetz <ptgoetz@gmail.com> Fri Sep 27 07:32:56 2013 -0700
tree cf38a03decdeaea18b6a919639a51a62a0ba49e6
parent d8dc1bd44dcf77ffce71674e77a25538a3f73132
parent 96a433a289b584ac66be8183ffa86da741a1a012

Merge pull request #683 from roadkill001/master

Fix for STORM_JAR_JVM_OPTS which is currently broken when STORM_JAR_JVM_OPTS is not specified

bin/storm

diff --git a/bin/storm b/bin/storm
index bd90b8f..444fb8b1 100755
--- a/bin/storm
+++ b/bin/storm
@@ -139,7 +139,7 @@
         jvmtype="-client",
         extrajars=[jarfile, USER_CONF_DIR, STORM_DIR + "/bin"],
         args=args,
-        jvmopts=[JAR_JVM_OPTS + " -Dstorm.jar=" + jarfile])
+        jvmopts=[' '.join(filter(None, [JAR_JVM_OPTS, "-Dstorm.jar=" + jarfile]))])
 
 def kill(*args):
     """Syntax: [storm kill topology-name [-w wait-time-secs]]