[js] Use JAVA_HOME if set.

Fixes #3523
SeleniumHQ · Feb 20, 2017 · 37dbe04 · 37dbe04 · activedecay · Feb 20, 2017
1 parent ed6dc8e
commit 37dbe04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/javascript/node/selenium-webdriver/CHANGES.md b/javascript/node/selenium-webdriver/CHANGES.md
@@ -9,6 +9,7 @@
   logging.installConsoleHandler();
   logging.getLogger('promise.ControlFlow').setLevel(logging.Level.WARNING);
   ```
+* If the `JAVA_HOME` environment variable is set, use it to locate java.exe.
 
 
 ## v3.1.0

diff --git a/javascript/node/selenium-webdriver/remote/index.js b/javascript/node/selenium-webdriver/remote/index.js
@@ -492,7 +492,12 @@ class SeleniumServer extends DriverService {
           return jvmArgs.concat('-jar', jar, '-port', port).concat(args);
         });
 
-    super('java', {
+    let java = 'java';
+    if (process.env['JAVA_HOME']) {
+      java = path.join(process.env['JAVA_HOME'], 'bin/java');
+    }
+
+    super(java, {
       loopback: options.loopback,
       port: port,
       args: args,