diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java index 9210b4ac756..9cb770d5c7c 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java +++ b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java @@ -132,13 +132,16 @@ public abstract class KtUsefulTestCase extends TestCase { UIUtil.removeLeakingAppleListeners(); super.tearDown(); - if (application == null) { - resetApplicationToNull(); - } + resetApplicationToNull(application); application = null; } + public static void resetApplicationToNull(Application old) { + if (old != null) return; + resetApplicationToNull(); + } + public static void resetApplicationToNull() { try { Field ourApplicationField = ApplicationManager.class.getDeclaredField("ourApplication");