From b690788b10b73a5a963fb3a72d1749916139cfd2 Mon Sep 17 00:00:00 2001 From: Jaikiran Pai Date: Sat, 15 Jan 2022 11:33:02 +0530 Subject: [PATCH] fix ant.bat script for Java 18 security manager configuration/check --- src/script/ant.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/script/ant.bat b/src/script/ant.bat index 69041a59b..0cdaf1b72 100755 --- a/src/script/ant.bat +++ b/src/script/ant.bat @@ -117,16 +117,16 @@ set _JAVACMD=%JAVACMD% if "%JAVA_HOME%" == "" goto noJavaHome if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe -goto checkJikes +goto setSecurityManagerOpt :noJavaHome if "%_JAVACMD%" == "" set _JAVACMD=java.exe :setSecurityManagerOpt "%_JAVACMD%" -XshowSettings:properties 2>&1 | find "java.specification.version = 18" -if "%ErrorLevel%" == "0" ( - rem This is Java 18, so set -Djava.security.manager=allow - set ANT_OPTS="%ANT_OPTS% -Djava.security.manager=allow" +if %errorlevel% EQU 0 ( +rem This is Java 18, so set -Djava.security.manager=allow +set ANT_OPTS=%ANT_OPTS% -Djava.security.manager=allow ) :checkJikes