Repository: incubator-nifi Updated Branches: refs/heads/develop 0f0d76670 -> 71989128b
NIFI-416: Applied change from Ricky Saltzer to favor JAVA_HOME environment variable over simple 'java' command if available and default java is set Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/71989128 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/71989128 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/71989128 Branch: refs/heads/develop Commit: 71989128b9e402eab2131dc4a0486ffa1e730474 Parents: 0f0d766 Author: Mark Payne <marka...@hotmail.com> Authored: Thu Mar 12 18:22:02 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Thu Mar 12 18:22:02 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/nifi/bootstrap/RunNiFi.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71989128/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java b/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java index f920860..28a9b71 100644 --- a/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java +++ b/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java @@ -65,6 +65,7 @@ import java.util.logging.Level; public class RunNiFi { public static final String DEFAULT_CONFIG_FILE = "./conf/bootstrap.conf"; public static final String DEFAULT_NIFI_PROPS_FILE = "./conf/nifi.properties"; + public static final String DEFAULT_JAVA_CMD = "java"; public static final String GRACEFUL_SHUTDOWN_PROP = "graceful.shutdown.seconds"; public static final String DEFAULT_GRACEFUL_SHUTDOWN_VALUE = "20"; @@ -675,8 +676,19 @@ public class RunNiFi { final String classPath = classPathBuilder.toString(); String javaCmd = props.get("java"); - if ( javaCmd == null ) { - javaCmd = "java"; + if (javaCmd == null) { + javaCmd = DEFAULT_JAVA_CMD; + } + if (javaCmd.equals(DEFAULT_JAVA_CMD)) { + String javaHome = System.getenv("JAVA_HOME"); + if (javaHome != null) { + String fileExtension = isWindows() ? ".exe" : ""; + File javaFile = new File(javaHome + File.separatorChar + "bin" + + File.separatorChar + "java" + fileExtension); + if (javaFile.exists() && javaFile.canExecute()) { + javaCmd = javaFile.getAbsolutePath(); + } + } } final NiFiListener listener = new NiFiListener();
