diff --git a/jcl/src/java.base/share/classes/java/lang/Access.java b/jcl/src/java.base/share/classes/java/lang/Access.java index 661d814a737..ee68d1d636c 100644 --- a/jcl/src/java.base/share/classes/java/lang/Access.java +++ b/jcl/src/java.base/share/classes/java/lang/Access.java @@ -87,6 +87,7 @@ import sun.reflect.annotation.AnnotationType; /*[IF JAVA_SPEC_VERSION >= 24]*/ import java.util.concurrent.Executor; +import java.util.concurrent.ScheduledExecutorService; import jdk.internal.loader.NativeLibraries; /*[ENDIF] JAVA_SPEC_VERSION >= 24 */ @@ -864,6 +865,13 @@ public byte stringInitCoder() { public Executor virtualThreadDefaultScheduler() { return VirtualThread.defaultScheduler(); } + + /*[IF !INLINE-TYPES]*/ + @Override + /*[ENDIF] !INLINE-TYPES */ + public Stream virtualThreadDelayedTaskSchedulers() { + return VirtualThread.delayedTaskSchedulers(); + } /*[ENDIF] JAVA_SPEC_VERSION >= 24 */ /*[ENDIF] JAVA_SPEC_VERSION >= 9 */ diff --git a/jcl/src/java.base/share/classes/openj9/internal/criu/security/CRIUConfigurator.java b/jcl/src/java.base/share/classes/openj9/internal/criu/security/CRIUConfigurator.java index d599a80bb06..27c15585969 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/criu/security/CRIUConfigurator.java +++ b/jcl/src/java.base/share/classes/openj9/internal/criu/security/CRIUConfigurator.java @@ -35,7 +35,6 @@ import java.util.TreeMap; import openj9.internal.criu.CRIUSECProvider; -import sun.security.action.GetPropertyAction; import sun.security.jca.ProviderList; import sun.security.jca.Providers; @@ -48,7 +47,12 @@ public final class CRIUConfigurator { private static final HashMap oldProviders = new HashMap<>(); /** Tracing for CRIUSEC. */ private static final boolean debug = Boolean.parseBoolean( - GetPropertyAction.privilegedGetProperty("enable.j9internal.checkpoint.security.api.debug", "false")); + /*[IF JAVA_SPEC_VERSION < 24]*/ + sun.security.action.GetPropertyAction.privilegedGetProperty + /*[ELSE] JAVA_SPEC_VERSION < 24 + System.getProperty + /*[ENDIF] JAVA_SPEC_VERSION < 24 */ + ("enable.j9internal.checkpoint.security.api.debug", "false")); private static final Map> cachedAlgorithms = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); private static boolean isCacheEligible;