jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1814314 - /jmeter/trunk/bin/jmeter
Date Sat, 04 Nov 2017 18:25:57 GMT
Author: fschumacher
Date: Sat Nov  4 18:25:57 2017
New Revision: 1814314

URL: http://svn.apache.org/viewvc?rev=1814314&view=rev
Log:
If JAVA_HOME is not set, but JRE_HOME is set or guessed, set JAVA_HOME to JRE_HOME before
resolving the java executable

Followup to r1811029
Bugzilla Id: 61529

Modified:
    jmeter/trunk/bin/jmeter

Modified: jmeter/trunk/bin/jmeter
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter?rev=1814314&r1=1814313&r2=1814314&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter (original)
+++ jmeter/trunk/bin/jmeter Sat Nov  4 18:25:57 2017
@@ -59,6 +59,9 @@ fi
 if [ -z "$JRE_HOME" ]; then
   JRE_HOME="$JAVA_HOME"
 fi
+if [ -z "$JAVA_HOME" ]; then
+  JAVA_HOME="$JRE_HOME"
+fi
 
 #--add-modules java.activation if JAVA 9
 ADD_MODS=



Mime
View raw message