From d126a9711c1eecd1d6ca47b60a79455bbb005472 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 9 Dec 2014 16:26:10 +0300 Subject: [PATCH] KT-6409 Do not create empty PersistentHashMap instances for modules without kotlin files during build #KT-6409 fixed --- .../jet/jps/incremental/IncrementalCacheImpl.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 047cea49340..2de26c8d59a 100644 --- a/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -44,6 +44,7 @@ import java.util.Scanner import org.jetbrains.jet.lang.resolve.java.JvmAbi import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind +import kotlin.properties.Delegates val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" @@ -63,10 +64,10 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC val FORMAT_VERSION_TXT = "format-version.txt" } - private val protoMap = ProtoMap() - private val constantsMap = ConstantsMap() - private val inlineFunctionsMap = InlineFunctionsMap() - private val packagePartMap = PackagePartMap() + private val protoMap by Delegates.lazy { ProtoMap() } + private val constantsMap by Delegates.lazy { ConstantsMap() } + private val inlineFunctionsMap by Delegates.lazy { InlineFunctionsMap() } + private val packagePartMap by Delegates.lazy { PackagePartMap() } private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap)