fix: find loaded class (#578)

arextest · Oct 23, 2024 · b367c39 · b367c39
1 parent 46bf34d
commit b367c39
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/arex-instrumentation-api/src/main/java/io/arex/inst/runtime/listener/EventProcessor.java b/arex-instrumentation-api/src/main/java/io/arex/inst/runtime/listener/EventProcessor.java
@@ -5,6 +5,7 @@
 import io.arex.agent.bootstrap.model.Mocker;
 import io.arex.agent.bootstrap.util.AdviceClassesCollector;
 import io.arex.agent.bootstrap.util.NumberUtil;
+import io.arex.agent.bootstrap.util.ReflectUtil;
 import io.arex.agent.bootstrap.util.StringUtil;
 import io.arex.agent.bootstrap.util.ServiceLoader;
 import io.arex.inst.runtime.config.Config;
@@ -18,6 +19,7 @@
 import io.arex.inst.runtime.serializer.StringSerializable;
 import io.arex.inst.runtime.util.MockUtils;
 
+import java.lang.reflect.Method;
 import java.util.List;
 
 import java.util.Set;
@@ -33,6 +35,7 @@ public class EventProcessor {
     private static final String CLOCK_METHOD = "currentTimeMillis";
     public static final String EXCLUDE_MOCK_TYPE = "java.util.HashMap-java.lang.String,java.util.HashSet";
     private static final AtomicReference<InitializeEnum> INIT_DEPENDENCY = new AtomicReference<>(InitializeEnum.START);
+    private static final Method FIND_LOADED_METHOD = ReflectUtil.getMethod(ClassLoader.class, "findLoadedClass", String.class);
     private static boolean existJacksonDependency = true;
     static {
         try {
@@ -154,19 +157,15 @@ private static void initClass(ClassLoader contextClassLoader) {
                     continue;
                 }
                 Class.forName(initClass, true, contextClassLoader);
-            } catch (ClassNotFoundException e) {
+            } catch (Throwable e) {
+                // if the class init fails, the next class init will continue
                 LOGGER.warn(LogManager.buildTitle("init.class"), e);
             }
         }
     }
 
     private static boolean isClassLoaded(String className, ClassLoader classLoader) {
-        try {
-            Class<?> clazz = classLoader.loadClass(className);
-            return clazz != null;
-        } catch (ClassNotFoundException e) {
-            return false;
-        }
+        return FIND_LOADED_METHOD == null || ReflectUtil.invoke(FIND_LOADED_METHOD, classLoader, className) != null;
     }
 
     private static void initLog(ClassLoader contextClassLoader) {

diff --git a/arex-instrumentation-api/src/test/java/io/arex/inst/runtime/listener/EventProcessorTest.java b/arex-instrumentation-api/src/test/java/io/arex/inst/runtime/listener/EventProcessorTest.java
@@ -17,6 +17,7 @@
 import io.arex.inst.runtime.serializer.StringSerializable;
 import io.arex.agent.bootstrap.util.ServiceLoader;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;