Prevent infinite recursion in loadClass()

2013-10-13 15:36:21 +04:00
parent ec43441190
commit 88bb113834
1 changed files with 10 additions and 2 deletions
@@ -12,14 +12,22 @@ class JDIEval(
        private val thread: jdi.ThreadReference
 ) : Eval {
    override fun loadClass(classType: Type): Value {
+        val loadedClasses = vm.classesByName(classType.getInternalName())
+        if (!loadedClasses.isEmpty()) {
+            return loadedClasses[0].classObject().asValue()
+        }
        return invokeStaticMethod(
                MethodDescription(
                        CLASS.getInternalName(),
                        "forName",
-                        "(Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/Class;",
+                        "(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;",
                        true
                ),
-                listOf(classLoader.asValue())
+                listOf(
+                        vm.mirrorOf(classType.getInternalName().replace('/', '.')).asValue(),
+                        boolean(true),
+                        classLoader.asValue()
+                )
        )
    }