You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2019/01/11 08:27:24 UTC
[ignite] branch master updated: IGNITE-10864: Fixed JDK version
check in ignite.bat. This closes #5784.
This is an automated email from the ASF dual-hosted git repository.
vozerov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new e638cf2 IGNITE-10864: Fixed JDK version check in ignite.bat. This closes #5784.
e638cf2 is described below
commit e638cf2423154e7dc5b693faecbdcbce5e52faa4
Author: tledkov-gridgain <tl...@gridgain.com>
AuthorDate: Fri Jan 11 11:26:59 2019 +0300
IGNITE-10864: Fixed JDK version check in ignite.bat. This closes #5784.
---
bin/ignite.bat | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/ignite.bat b/bin/ignite.bat
index 2d5a08d..cfb0810 100644
--- a/bin/ignite.bat
+++ b/bin/ignite.bat
@@ -52,7 +52,7 @@ for /f "tokens=* USEBACKQ" %%f in (`%cmd% -version 2^>^&1`) do (
for /f "tokens=1-3 delims= " %%a in ("%var%") do set JAVA_VER_STR=%%c
set JAVA_VER_STR=%JAVA_VER_STR:"=%
-for /f "tokens=1,2 delims=." %%a in ("%JAVA_VER_STR%.x") do set MAJOR_JAVA_VER=%%a & set MINOR_JAVA_VER=%%b
+for /f "tokens=1,2 delims=." %%a in ("%JAVA_VER_STR%.x") do set MAJOR_JAVA_VER=%%a& set MINOR_JAVA_VER=%%b
if %MAJOR_JAVA_VER% == 1 set MAJOR_JAVA_VER=%MINOR_JAVA_VER%
if %MAJOR_JAVA_VER% LSS 8 (
@@ -228,7 +228,7 @@ if "%MAIN_CLASS%" == "" set MAIN_CLASS=org.apache.ignite.startup.cmdline.Command
::
:: Final JVM_OPTS for Java 9+ compatibility
::
-if "%MAJOR_JAVA_VER%" == "8" (
+if %MAJOR_JAVA_VER% == 8 (
set JVM_OPTS= ^
-XX:+AggressiveOpts ^
%JVM_OPTS%
@@ -248,7 +248,7 @@ if %MAJOR_JAVA_VER% GEQ 9 if %MAJOR_JAVA_VER% LSS 11 (
%JVM_OPTS%
)
-if "%MAJOR_JAVA_VER%" == "11" (
+if %MAJOR_JAVA_VER% == 11 (
set JVM_OPTS= ^
--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED ^
--add-exports=java.base/sun.nio.ch=ALL-UNNAMED ^