From 0ea65491aab5ac189cf93cb17c55d32200e4a504 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Thu, 11 Jun 2015 16:09:26 +0300 Subject: [PATCH] Disable all jdi request during evaluation --- .../idea/debugger/evaluate/KotlinEvaluationBuilder.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt index 8fa7b50fb19..4da92b78e4c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt @@ -222,8 +222,9 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment, return object : MethodNode(Opcodes.ASM5, access, name, desc, signature, exceptions) { override fun visitEnd() { - val breakpoints = virtualMachine.eventRequestManager().breakpointRequests() - breakpoints?.forEach { it.disable() } + val allRequests = virtualMachine.eventRequestManager().breakpointRequests() + + virtualMachine.eventRequestManager().classPrepareRequests() + allRequests.forEach { it.disable() } val eval = JDIEval(virtualMachine, context.getClassLoader(), @@ -236,7 +237,7 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment, eval ) - breakpoints?.forEach { it.enable() } + allRequests.forEach { it.enable() } } } }