From 96d0c4a1db6110297e28b4deda415e4e887166c1 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Mon, 7 Dec 2015 16:19:27 +0300
Subject: [PATCH] Nullability bug fix in the source code

---
 .../jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt | 3 +--
 .../kotlin/idea/filters/AbstractKotlinExceptionFilterTest.kt   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
index defa534efdc..2cefcdfff03 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
@@ -313,8 +313,7 @@ public class KotlinCoreEnvironment private constructor(
 
         public fun disposeApplicationEnvironment() {
             synchronized (APPLICATION_LOCK) {
-                if (ourApplicationEnvironment == null) return
-                val environment = ourApplicationEnvironment
+                val environment = ourApplicationEnvironment ?: return
                 ourApplicationEnvironment = null
                 Disposer.dispose(environment.getParentDisposable())
             }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/filters/AbstractKotlinExceptionFilterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/filters/AbstractKotlinExceptionFilterTest.kt
index aa26ee19ed3..678a0659d64 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/filters/AbstractKotlinExceptionFilterTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/filters/AbstractKotlinExceptionFilterTest.kt
@@ -61,7 +61,7 @@ public abstract class AbstractKotlinExceptionFilterTest: KotlinCodeInsightTestCa
                 MOCK_LIBRARY_JAR = MockLibraryUtil.compileLibraryToJar(MOCK_LIBRARY_SOURCES, "mockLibrary", true)
             }
 
-            val mockLibraryJar = MOCK_LIBRARY_JAR
+            val mockLibraryJar = MOCK_LIBRARY_JAR ?: throw AssertionError("Mock library JAR is null")
             val mockLibraryPath = FileUtilRt.toSystemIndependentName(mockLibraryJar.canonicalPath)
             val libRootUrl = "jar://$mockLibraryPath!/"