From 6590497b8d82e8b2955e98626a0eecb1e8793c5d Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 28 Nov 2018 02:24:00 +0900 Subject: [PATCH] Revert "Minor: Remove a deprecated method usage" The method is still actual in IDEA 181 and Android Studio 3.1/3.2. --- .../evaluate/classLoading/OrdinaryClassLoadingAdapter.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/classLoading/OrdinaryClassLoadingAdapter.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/classLoading/OrdinaryClassLoadingAdapter.kt index 0390a0b611f..be187ee2524 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/classLoading/OrdinaryClassLoadingAdapter.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/classLoading/OrdinaryClassLoadingAdapter.kt @@ -20,6 +20,7 @@ import com.intellij.debugger.engine.DebugProcessImpl import com.intellij.debugger.engine.evaluation.EvaluateException import com.intellij.debugger.engine.evaluation.EvaluationContextImpl import com.intellij.debugger.impl.ClassLoadingUtils +import com.intellij.debugger.impl.DebuggerUtilsEx import com.intellij.openapi.projectRoots.JavaSdkVersion import com.intellij.openapi.util.SystemInfo import com.sun.jdi.ClassLoaderReference @@ -110,7 +111,7 @@ class OrdinaryClassLoadingAdapter : ClassLoadingAdapter { val defineMethod = classLoaderType.concreteMethodByName("defineClass", "(Ljava/lang/String;[BII)Ljava/lang/Class;") val nameObj = vm.mirrorOf(name) - context.keep(nameObj) + DebuggerUtilsEx.keep(nameObj, context) process.invokeMethod( context, classLoader, defineMethod,