Skip to content

Commit 2decc4b

Browse files
authored
Merge pull request #18988 from singh264/openj9_issues_18556_for_v0.44.0-release
(0.44) Fix intermittent LogGeneratedClassesTest failures
2 parents da2c022 + 63826d4 commit 2decc4b

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

jcl/src/java.base/share/classes/openj9/internal/criu/InternalCRIUSupport.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ private static native void checkpointJVMImpl(String imageDir,
231231

232232
private static native String[] getRestoreSystemProperites();
233233

234-
static {
234+
private static void initializeUnsafe() {
235235
AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
236236
try {
237237
Field f = Unsafe.class.getDeclaredField("theUnsafe"); //$NON-NLS-1$
@@ -809,6 +809,10 @@ private void registerRestoreEnvVariables() {
809809
return;
810810
}
811811

812+
if (unsafe == null) {
813+
initializeUnsafe();
814+
}
815+
812816
J9InternalCheckpointHookAPI.registerPostRestoreHook(HookMode.SINGLE_THREAD_MODE, RESTORE_ENVIRONMENT_VARIABLES_PRIORITY,
813817
"Restore environment variables via env file: " + envFile, () -> { //$NON-NLS-1$
814818
if (!Files.exists(this.envFile)) {

0 commit comments

Comments
 (0)