[tomee] branch master updated: TOMEE-2712 Get environment variable with tokens

[jg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new 9e0843f  TOMEE-2712 Get environment variable with tokens
     new b79e39f  Merge pull request #592 from sercheo87/TOMEE-2712
9e0843f is described below

commit 9e0843fc50856dee56fa49847c2dfdc8e53f5921
Author: sercheo87 <se...@icloud.com>
AuthorDate: Sat Oct 19 09:56:42 2019 -0500

    TOMEE-2712 Get environment variable with tokens
---
 tomee/apache-tomee/src/main/resources/service.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tomee/apache-tomee/src/main/resources/service.bat b/tomee/apache-tomee/src/main/resources/service.bat
index 4485423..c94ff29 100644
--- a/tomee/apache-tomee/src/main/resources/service.bat
+++ b/tomee/apache-tomee/src/main/resources/service.bat
@@ -91,7 +91,7 @@ if not exist "%JRE_HOME%\bin\javaw.exe" goto noJavaHome
 goto okJavaHome
 :gotJdkHome
 for /f tokens^=2^ delims^=.-_^" %%j in ('"%JAVA_HOME%\bin\java.exe" -fullversion 2^>^&1') do set "JAVA_MAJOR_VERSION=%%j"
-if JAVA_MAJOR_VERSION lss 11 (
+if %JAVA_MAJOR_VERSION% lss 11 (
     if not exist "%JAVA_HOME%\jre\bin\java.exe" goto noJavaHome
     if not exist "%JAVA_HOME%\jre\bin\javaw.exe" goto noJavaHome
 )