From 6046abccab85f2cfde5e20476d3b9ea1b1ab1ff9 Mon Sep 17 00:00:00 2001 From: Vadim Mishenev Date: Fri, 29 Apr 2022 16:59:53 +0300 Subject: [PATCH] Fix `StorageManager` deadlock (#2480) --- .../kotlin/org/jetbrains/dokka/analysis/AnalysisEnvironment.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/AnalysisEnvironment.kt b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/AnalysisEnvironment.kt index 4691670578..4816209733 100644 --- a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/AnalysisEnvironment.kt +++ b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/AnalysisEnvironment.kt @@ -76,6 +76,7 @@ import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters import org.jetbrains.kotlin.resolve.jvm.JvmResolverForModuleFactory import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatformAnalyzerServices import org.jetbrains.kotlin.resolve.konan.platform.NativePlatformAnalyzerServices +import org.jetbrains.kotlin.storage.LockBasedStorageManager import java.io.File import org.jetbrains.kotlin.konan.file.File as KFile @@ -194,7 +195,7 @@ class AnalysisEnvironment(val messageCollector: MessageCollector, val analysisPl val commonDependencyContainer = if (analysisPlatform == Platform.common) DokkaKlibMetadataCommonDependencyContainer( kotlinLibraries.values.toList(), environment.configuration, - projectContext.storageManager + LockBasedStorageManager("DokkaKlibMetadata") ) else null val extraModuleDependencies = kotlinLibraries.values.registerLibraries() + commonDependencyContainer?.moduleInfos.orEmpty()