diff --git a/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt b/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt index 7ac62ffe074..acee5836f3d 100644 --- a/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt +++ b/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt @@ -53,9 +53,10 @@ class JDIEval( fun loadClass(classType: Type, classLoader: ClassLoaderReference?): Value { val loadedClasses = vm.classesByName(classType.internalName) if (!loadedClasses.isEmpty()) { - val loadedClass = loadedClasses[0] - if (classType.descriptor in BOOTSTRAP_CLASS_DESCRIPTORS || loadedClass.classLoader() == classLoader) { - return loadedClass.classObject().asValue() + for (loadedClass in loadedClasses) { + if (loadedClass.isPrepared && (classType.descriptor in BOOTSTRAP_CLASS_DESCRIPTORS || loadedClass.classLoader() == classLoader)) { + return loadedClass.classObject().asValue() + } } } if (classLoader == null) {