Merge pull request #20303 from JasonFengJ9/clnamelocknotsafe

CRIU adds @NotCheckpointSafe at ClassLoader.getClassLoadingLock()
eclipse-openj9 · Oct 7, 2024 · 574551f · 574551f
2 parents 845b1ce + b5b044f
commit 574551f
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/jcl/src/java.base/share/classes/java/lang/ClassLoader.java b/jcl/src/java.base/share/classes/java/lang/ClassLoader.java
@@ -72,6 +72,10 @@
 import jdk.internal.reflect.CallerSensitiveAdapter;
 /*[ENDIF] JAVA_SPEC_VERSION >= 18 */
 
+/*[IF CRIU_SUPPORT]*/
+import openj9.internal.criu.NotCheckpointSafe;
+/*[ENDIF] CRIU_SUPPORT*/
+
 /**
  * ClassLoaders are used to dynamically load, link and install
  * classes into a running image.
@@ -1460,6 +1464,9 @@ private static boolean registerAsParallelCapable(Class<?> callerCls) {
  * @see java.lang.ClassLoader
  *
  */
+/*[IF CRIU_SUPPORT]*/
+@NotCheckpointSafe
+/*[ENDIF] CRIU_SUPPORT */
 protected Object getClassLoadingLock(final String className) {
  Object lock = this;
  if (isParallelCapable) {