Skip to content

Commit 4bb34eb

Browse files
authored
Merge pull request #20311 from JasonFengJ9/clnamelocknotsafe-0.48
(0.48) CRIU adds @NotCheckpointSafe at ClassLoader.getClassLoadingLock()
2 parents 8899b66 + cc3b75f commit 4bb34eb

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

jcl/src/java.base/share/classes/java/lang/ClassLoader.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@
7272
import jdk.internal.reflect.CallerSensitiveAdapter;
7373
/*[ENDIF] JAVA_SPEC_VERSION >= 18 */
7474

75+
/*[IF CRIU_SUPPORT]*/
76+
import openj9.internal.criu.NotCheckpointSafe;
77+
/*[ENDIF] CRIU_SUPPORT*/
78+
7579
/**
7680
* ClassLoaders are used to dynamically load, link and install
7781
* classes into a running image.
@@ -1460,6 +1464,9 @@ private static boolean registerAsParallelCapable(Class<?> callerCls) {
14601464
* @see java.lang.ClassLoader
14611465
*
14621466
*/
1467+
/*[IF CRIU_SUPPORT]*/
1468+
@NotCheckpointSafe
1469+
/*[ENDIF] CRIU_SUPPORT */
14631470
protected Object getClassLoadingLock(final String className) {
14641471
Object lock = this;
14651472
if (isParallelCapable) {

0 commit comments

Comments
 (0)