Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Export jdk.management/com.ibm.. only for OpenJ9 VM [5.1.z] #21814

Merged
merged 1 commit into from Jul 20, 2022
Merged

Export jdk.management/com.ibm.. only for OpenJ9 VM [5.1.z] #21814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion distribution/src/bin-regular/common.sh
View file
Open in desktop
Expand Up @@ -39,12 +39,16 @@ if [ "$JAVA_VERSION" -ge "9" ]; then
JDK_OPTS="\
--add-modules java.se \
--add-exports java.base/jdk.internal.ref=ALL-UNNAMED \
--add-exports jdk.management/com.ibm.lang.management.internal=ALL-UNNAMED \
--add-opens java.base/java.lang=ALL-UNNAMED \
--add-opens java.base/sun.nio.ch=ALL-UNNAMED \
--add-opens java.management/sun.management=ALL-UNNAMED \
--add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED \
"

VM_NAME=$(${JAVA} -XshowSettings:properties -version 2>&1 | grep java.vm.name | cut -d "=" -f2)
if [[ "$VM_NAME" =~ "OpenJ9" ]]; then
JDK_OPTS="$JDK_OPTS --add-exports jdk.management/com.ibm.lang.management.internal=ALL-UNNAMED"
fi
fi

if [ -n "${CLASSPATH}" ]; then
Expand Down
14 changes: 12 additions & 2 deletions distribution/src/bin-regular/hz-start.bat
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ if "x%JAVA_HOME%" == "x" (

"%RUN_JAVA%" -version 1>nul 2>nul || (
echo JAVA could not be found in your system.
echo Please install Java 1.8 or higher!!!
echo Please install Java 1.8 or higher
exit /b 2
)
set HAZELCAST_HOME=%~dp0..
Expand All @@ -36,7 +36,17 @@ if NOT "%MAX_HEAP_SIZE%" == "" (
FOR /F "tokens=* USEBACKQ" %%F IN (`CALL "%RUN_JAVA%" -cp "%HAZELCAST_HOME%\lib\*" com.hazelcast.internal.util.JavaVersion`) DO SET JAVA_VERSION=%%F

IF NOT "%JAVA_VERSION%" == "8" (
set JAVA_OPTS=%JAVA_OPTS% --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports jdk.management/com.ibm.lang.management.internal=ALL-UNNAMED
set JAVA_OPTS=%JAVA_OPTS% --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED

for /f "tokens=2 delims== usebackq" %%a in (`java -XshowSettings:properties -version 2^>^&1 ^| findstr /c:"java.vm.name"`) do (
set VM_NAME=%%a
)

echo "!VM_NAME!" | find /I "OpenJ9" && (
REM OpenJ9 detected, adding additional exports
set JAVA_OPTS=%JAVA_OPTS% --add-exports jdk.management/com.ibm.lang.management.internal=ALL-UNNAMED
)

)

REM HAZELCAST_CONFIG holds path to the configuration file. The path is relative to the Hazelcast installation (HAZELCAST_HOME).
Expand Down