You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2018/01/27 14:44:22 UTC
svn commit: r1822412 - /jmeter/trunk/bin/jmeter.bat
Author: pmouawad
Date: Sat Jan 27 14:44:22 2018
New Revision: 1822412
URL: http://svn.apache.org/viewvc?rev=1822412&view=rev
Log:
Bug 61529 : Migration to Java 9
Fix wrong version detection
Bugzilla Id: 61529
Modified:
jmeter/trunk/bin/jmeter.bat
Modified: jmeter/trunk/bin/jmeter.bat
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1822412&r1=1822411&r2=1822412&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.bat (original)
+++ jmeter/trunk/bin/jmeter.bat Sat Jan 27 14:44:22 2018
@@ -92,7 +92,8 @@ if not defined JAVAVER (
rem Check if version is from OpenJDK or Oracle Hotspot JVM prior to 9 containing 1.${version}.x
-IF "%variable:~0,2%"=="1." (
+rem JAVAVER will contain "XXXX", so we extract 2 chars starting from index 1
+IF "%JAVAVER:~1,2%"=="1." (
set JAVAVER=%JAVAVER:"=%
for /f "delims=. tokens=1-3" %%v in ("%JAVAVER%") do (
set current_minor=%%w
Re: svn commit: r1822412 - /jmeter/trunk/bin/jmeter.bat
Posted by Felix Schumacher <fe...@internetallee.de>.
Am 27. Januar 2018 15:44:22 MEZ schrieb pmouawad@apache.org:
>Author: pmouawad
>Date: Sat Jan 27 14:44:22 2018
>New Revision: 1822412
>
>URL: http://svn.apache.org/viewvc?rev=1822412&view=rev
>Log:
>Bug 61529 : Migration to Java 9
>Fix wrong version detection
>Bugzilla Id: 61529
>
>Modified:
> jmeter/trunk/bin/jmeter.bat
>
>Modified: jmeter/trunk/bin/jmeter.bat
>URL:
>http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1822412&r1=1822411&r2=1822412&view=diff
>==============================================================================
>--- jmeter/trunk/bin/jmeter.bat (original)
>+++ jmeter/trunk/bin/jmeter.bat Sat Jan 27 14:44:22 2018
>@@ -92,7 +92,8 @@ if not defined JAVAVER (
>
>
>rem Check if version is from OpenJDK or Oracle Hotspot JVM prior to 9
>containing 1.${version}.x
>-IF "%variable:~0,2%"=="1." (
>+rem JAVAVER will contain "XXXX", so we extract 2 chars starting from
Does it really contain XXXX? I think two examples for Java 8 and 9 would be better for documentation.
Felix
>index 1
>+IF "%JAVAVER:~1,2%"=="1." (
> set JAVAVER=%JAVAVER:"=%
> for /f "delims=. tokens=1-3" %%v in ("%JAVAVER%") do (
> set current_minor=%%w