Repository: storm Updated Branches: refs/heads/master 28e64c9e5 -> 577e34e7e
Upmerge, and address code comment Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/74f243cd Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/74f243cd Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/74f243cd Branch: refs/heads/master Commit: 74f243cd6ac154c2557b936f7d95c7f29a88594a Parents: a55bbbe Author: Paul Poulosky <[email protected]> Authored: Wed Jun 3 12:21:06 2015 -0500 Committer: Paul Poulosky <[email protected]> Committed: Wed Jun 3 12:21:06 2015 -0500 ---------------------------------------------------------------------- bin/storm.py | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/74f243cd/bin/storm.py ---------------------------------------------------------------------- diff --git a/bin/storm.py b/bin/storm.py index 455a4c0..dbf84b8 100755 --- a/bin/storm.py +++ b/bin/storm.py @@ -85,6 +85,9 @@ CONFFILE = "" JAR_JVM_OPTS = shlex.split(os.getenv('STORM_JAR_JVM_OPTS', '')) JAVA_HOME = os.getenv('JAVA_HOME', None) JAVA_CMD = 'java' if not JAVA_HOME else os.path.join(JAVA_HOME, 'bin', 'java') +if JAVA_HOME and not os.path.exists(JAVA_CMD): + print "ERROR: JAVA_HOME is invalid. Could not find bin/java at %s." % JAVA_HOME + sys.exit(1) STORM_EXT_CLASSPATH = os.getenv('STORM_EXT_CLASSPATH', None) STORM_EXT_CLASSPATH_DAEMON = os.getenv('STORM_EXT_CLASSPATH_DAEMON', None)
