From 7ea3a50848fe7ec2cfe37831d99f339f2c602744 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 26 Jan 2016 16:06:10 +0300 Subject: [PATCH] Make LookupStorage thread safe #KT-10792: Fixed Original commit: 0a48d831763643ae475d4160c41beed8c70fc978 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 936410c8a2d..2a27f056ffe 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -560,9 +560,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider) - filesToCompile.values().forEach { lookupStorage.removeLookupsFrom(it) } val removedFiles = chunk.targets.flatMap { KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it) } - removedFiles.forEach { lookupStorage.removeLookupsFrom(it) } + lookupStorage.removeLookupsFrom(filesToCompile.values().asSequence() + removedFiles.asSequence()) lookupStorage.addAll(lookupTracker.lookups.entrySet(), lookupTracker.pathInterner.values) }