From be99f44c4f8692a08cae47842a1aed79c5a07cf4 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 14 Jan 2020 20:41:11 +0900 Subject: [PATCH] EA-209623: Check library disposed state --- .../framework/LibraryEffectiveKindProviderImpl.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/LibraryEffectiveKindProviderImpl.kt b/idea/src/org/jetbrains/kotlin/idea/framework/LibraryEffectiveKindProviderImpl.kt index 5d32ccb8db1..71e88678629 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/LibraryEffectiveKindProviderImpl.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/LibraryEffectiveKindProviderImpl.kt @@ -32,10 +32,16 @@ class LibraryEffectiveKindProviderImpl(project: Project) : LibraryEffectiveKindP ) } - override fun getEffectiveKind(library: LibraryEx): PersistentLibraryKind<*>? = when (val kind = library.kind) { - is KotlinLibraryKind -> kind - else -> synchronized(effectiveKindMap) { - effectiveKindMap.get(library) + override fun getEffectiveKind(library: LibraryEx): PersistentLibraryKind<*>? { + if (library.isDisposed) { + return null + } + + return when (val kind = library.kind) { + is KotlinLibraryKind -> kind + else -> synchronized(effectiveKindMap) { + effectiveKindMap.get(library) + } } } } \ No newline at end of file