Skip to content

Commit

Permalink
GG-18767 Web Console: Fixed web agent launch script. #36
Browse files Browse the repository at this point in the history
  • Loading branch information
vsisko authored and akuznetsov-os committed Jun 5, 2019
1 parent 539a3df commit 26bd56b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions modules/web-console/web-agent/bin/ignite-web-agent.bat
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,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 (
Expand Down Expand Up @@ -96,7 +96,7 @@ set JVM_OPTS=%JVM_OPTS% -Djava.net.useSystemProxies=true -Djdk.http.auth.tunneli
::
:: Final JVM_OPTS for Java 9+ compatibility
::
if "%MAJOR_JAVA_VER%" == "8" (
if %MAJOR_JAVA_VER% == 8 (
set JVM_OPTS= ^
-XX:+AggressiveOpts ^
%JVM_OPTS%
Expand All @@ -116,7 +116,7 @@ if %MAJOR_JAVA_VER% GEQ 9 if %MAJOR_JAVA_VER% LSS 11 (
%JVM_OPTS%
)

if "%MAJOR_JAVA_VER%" GEQ "11" (
if %MAJOR_JAVA_VER% GEQ 11 (
set JVM_OPTS= ^
--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED ^
--add-exports=java.base/sun.nio.ch=ALL-UNNAMED ^
Expand Down

0 comments on commit 26bd56b

Please sign in to comment.