diff options
| author | Vadim Mishenev <vad-mishenev@yandex.ru> | 2022-04-29 16:59:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-29 16:59:53 +0300 |
| commit | 6046abccab85f2cfde5e20476d3b9ea1b1ab1ff9 (patch) | |
| tree | 0e28589ed1d381174c8817ada61f29584e94f947 /kotlin-analysis/src/main/kotlin/org | |
| parent | 8c218ff4dd5f970233c43845c19299fc74256389 (diff) | |
| download | dokka-6046abccab85f2cfde5e20476d3b9ea1b1ab1ff9.tar.gz dokka-6046abccab85f2cfde5e20476d3b9ea1b1ab1ff9.tar.bz2 dokka-6046abccab85f2cfde5e20476d3b9ea1b1ab1ff9.zip | |
Fix `StorageManager` deadlock (#2480)
Diffstat (limited to 'kotlin-analysis/src/main/kotlin/org')
| -rw-r--r-- | kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/AnalysisEnvironment.kt | 3 |
1 files changed, 2 insertions, 1 deletions
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 46916705..48162097 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() |