avoid using getContextClassLoader()

calvinccheung · Oct 30, 2024 · e85ab0b · e85ab0b
1 parent c60b76e
commit e85ab0b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/OldClassAndRedefineClassApp.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/OldClassAndRedefineClassApp.java
@@ -31,12 +31,12 @@ public static void main(String args[]) throws Throwable {
 
         System.out.println("Main: loading OldSuper");
         // Load an old class (version 49), but not linking it.
-        Thread.currentThread().getContextClassLoader().loadClass("OldSuper");
+        ClassLoader.getSystemClassLoader().loadClass("OldSuper");
 
         // Redefine a class unrelated to the above old class.
         Instrumentation instrumentation = InstrumentationRegisterClassFileTransformer.getInstrumentation();
         System.out.println("INFO: instrumentation = " + instrumentation);
-        Class c = Thread.currentThread().getContextClassLoader().loadClass("Hello");
+        Class c = ClassLoader.getSystemClassLoader().loadClass("Hello");
         byte[] bytes = c.getClassLoader().getResourceAsStream(c.getName().replace('.', '/') + ".class").readAllBytes();
         instrumentation.redefineClasses(new ClassDefinition(c, bytes));
 

diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineBootClassApp.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineBootClassApp.java
@@ -30,7 +30,7 @@ public class RedefineBootClassApp {
     public static void main(String args[]) throws Throwable {
         File bootJar = new File(args[0]);
 
-        Class superCls = Thread.currentThread().getContextClassLoader().loadClass("BootSuper");
+        Class superCls = Class.forName("BootSuper", false, null);
         System.out.println("BootSuper>> loader = " + superCls.getClassLoader());
 
         {
@@ -53,7 +53,7 @@ public static void main(String args[]) throws Throwable {
             }
         }
 
-        Class childCls = Thread.currentThread().getContextClassLoader().loadClass("BootChild");
+        Class childCls = Class.forName("BootChild", false, null);
         System.out.println("BootChild>> loader = " + childCls.getClassLoader());
 
 

diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineOldSuperApp.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/redefineClasses/RedefineOldSuperApp.java
@@ -30,7 +30,7 @@ public class RedefineOldSuperApp {
     public static void main(String args[]) throws Throwable {
         File bootJar = new File(args[0]);
 
-        Class superCls = Thread.currentThread().getContextClassLoader().loadClass("OldSuper");
+        Class superCls = ClassLoader.getSystemClassLoader().loadClass("OldSuper");
         System.out.println("OldSuper>> loader = " + superCls.getClassLoader());
 
         {
@@ -53,7 +53,7 @@ public static void main(String args[]) throws Throwable {
             }
         }
 
-        Class childCls = Thread.currentThread().getContextClassLoader().loadClass("NewChild");
+        Class childCls = ClassLoader.getSystemClassLoader().loadClass("NewChild");
         System.out.println("NewChild>> loader = " + childCls.getClassLoader());