azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JDIEval: allow classLoader to be null (load class from caller classloader)

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-02-25 14:21:27 +03:00
parent b0422990d9
commit 957d1c19c5
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt
+27 -14
View File
@@ -29,7 +29,7 @@ val BOOTSTRAP_CLASS_DESCRIPTORS = setOf("Ljava/lang/String;", "Ljava/lang/ClassL
public class JDIEval( public class JDIEval(
private val vm: jdi.VirtualMachine, private val vm: jdi.VirtualMachine,
private val classLoader: jdi.ClassLoaderReference, private val classLoader: jdi.ClassLoaderReference?,
private val thread: jdi.ThreadReference, private val thread: jdi.ThreadReference,
private val invokePolicy: Int private val invokePolicy: Int
) : Eval { ) : Eval {
@@ -53,19 +53,32 @@ public class JDIEval(
return loadedClass.classObject().asValue() return loadedClass.classObject().asValue()
} }
} }
return invokeStaticMethod( if (classLoader == null) {
MethodDescription( return invokeStaticMethod(
CLASS.getInternalName(), MethodDescription(
"forName", CLASS.getInternalName(),
"(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;", "forName",
true "(Ljava/lang/String;)Ljava/lang/Class;",
), true
listOf( ),
vm.mirrorOf(classType.getInternalName().replace('/', '.')).asValue(), listOf(vm.mirrorOf(classType.getInternalName().replace('/', '.')).asValue())
boolean(true), )
classLoader.asValue() }
) else {
) return invokeStaticMethod(
MethodDescription(
CLASS.getInternalName(),
"forName",
"(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;",
true
),
listOf(
vm.mirrorOf(classType.getInternalName().replace('/', '.')).asValue(),
boolean(true),
classLoader.asValue()
)
)
}
} }
override fun loadString(str: String): Value = vm.mirrorOf(str).asValue() override fun loadString(str: String): Value = vm.mirrorOf(str).asValue()