From a86e0336c9e1dd3c62e971a2e7c20bc77ae423e4 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Fri, 7 Nov 2014 16:08:25 +0300 Subject: [PATCH] Fix EA-60377 - readAccess for isSubclass --- .../plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt index de2099a94e2..6c2ffaee5dc 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt @@ -30,6 +30,7 @@ import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.apache.log4j.Logger +import org.jetbrains.jet.plugin.util.application.runReadAction class KotlinEvaluateExpressionCache(val project: Project) { @@ -79,7 +80,7 @@ class KotlinEvaluateExpressionCache(val project: Project) { val thisDescriptor = value.asmType.getClassDescriptor(project) val superClassDescriptor = jetType.getConstructor().getDeclarationDescriptor() as? ClassDescriptor - return@all thisDescriptor != null && superClassDescriptor != null && DescriptorUtils.isSubclass(thisDescriptor, superClassDescriptor) + return@all thisDescriptor != null && superClassDescriptor != null && runReadAction { DescriptorUtils.isSubclass(thisDescriptor, superClassDescriptor) }!! } }