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

Eval4J: loadClass should return prepared class, otherwise ClassNotPreparedException fails in invokeMethod

Browse Source 
#KT-12641 Fixed
This commit is contained in:
Natalia Ukhorskaya
2016-08-12 15:56:08 +03:00
parent f6bb70aad1
commit fca5834557
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt
+4 -3
View File
@@ -53,9 +53,10 @@ class JDIEval(
fun loadClass(classType: Type, classLoader: ClassLoaderReference?): Value { fun loadClass(classType: Type, classLoader: ClassLoaderReference?): Value {
val loadedClasses = vm.classesByName(classType.internalName) val loadedClasses = vm.classesByName(classType.internalName)
if (!loadedClasses.isEmpty()) { if (!loadedClasses.isEmpty()) {
val loadedClass = loadedClasses[0] for (loadedClass in loadedClasses) {
if (classType.descriptor in BOOTSTRAP_CLASS_DESCRIPTORS || loadedClass.classLoader() == classLoader) { if (loadedClass.isPrepared && (classType.descriptor in BOOTSTRAP_CLASS_DESCRIPTORS || loadedClass.classLoader() == classLoader)) {
return loadedClass.classObject().asValue() return loadedClass.classObject().asValue()
}
} }
} }
if (classLoader == null) { if (classLoader == null) {