svn commit: r1824348 - in /jmeter/trunk: bin/jmeter.bat xdocs/changes.xml

[fs...@apache.org]

Author: fschumacher
Date: Thu Feb 15 19:25:26 2018
New Revision: 1824348

URL: http://svn.apache.org/viewvc?rev=1824348&view=rev
Log:
JMeter fails to start under Windows when JM_LAUNCH contains spaces

Bugzilla Id: 62107

Modified:
    jmeter/trunk/bin/jmeter.bat
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/bin/jmeter.bat
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1824348&r1=1824347&r2=1824348&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.bat (original)
+++ jmeter/trunk/bin/jmeter.bat Thu Feb 15 19:25:26 2018
@@ -126,10 +126,14 @@ if %current_minor% LSS %minimal_minor% (
     goto pause
 )
 
-if .%JM_LAUNCH% == . set JM_LAUNCH=java.exe
+if not defined JM_LAUNCH (
+    set JM_LAUNCH=java.exe
+)
 
 if exist jmeter.bat goto winNT1
-if .%JMETER_BIN% == . set JMETER_BIN=%~dp0
+if not defined JMETER_BIN (
+    set JMETER_BIN=%~dp0
+)
 
 :winNT1
 rem On NT/2K grab all arguments at once

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1824348&r1=1824347&r2=1824348&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Feb 15 19:25:26 2018
@@ -163,6 +163,7 @@ Summary
 
 <h3>General</h3>
 <ul>
+  <li><bug>62107</bug>JMeter fails to start under Windows when <code>JM_LAUNCH</code> contains spaces</li>
 </ul>
 
  <!--  =================== Thanks =================== -->