azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nullability bug fix in the source code

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-12-07 16:19:27 +03:00
parent bfad9bd87f
commit 96d0c4a1db
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+1 -2
View File
@@ -313,8 +313,7 @@ public class KotlinCoreEnvironment private constructor(
public fun disposeApplicationEnvironment() { public fun disposeApplicationEnvironment() {
synchronized (APPLICATION_LOCK) { synchronized (APPLICATION_LOCK) {
if (ourApplicationEnvironment == null) return val environment = ourApplicationEnvironment ?: return
val environment = ourApplicationEnvironment
ourApplicationEnvironment = null ourApplicationEnvironment = null
Disposer.dispose(environment.getParentDisposable()) Disposer.dispose(environment.getParentDisposable())
} }
idea/tests/org/jetbrains/kotlin/idea/filters/AbstractKotlinExceptionFilterTest.kt
+1 -1
View File
@@ -61,7 +61,7 @@ public abstract class AbstractKotlinExceptionFilterTest: KotlinCodeInsightTestCa
MOCK_LIBRARY_JAR = MockLibraryUtil.compileLibraryToJar(MOCK_LIBRARY_SOURCES, "mockLibrary", true) 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 mockLibraryPath = FileUtilRt.toSystemIndependentName(mockLibraryJar.canonicalPath)
val libRootUrl = "jar://$mockLibraryPath!/" val libRootUrl = "jar://$mockLibraryPath!/"