From 15faa6610cac7b6f6f625c9030102e2949b4a0a3 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 9 Dec 2015 21:21:09 +0300 Subject: [PATCH] Android Extensions: do not cache package fragment provider with synthetic properties (KT-10318) --- .../res/AndroidPackageFragmentProviderExtension.kt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt index 749158db375..e547835a996 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt @@ -27,13 +27,10 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension import org.jetbrains.kotlin.storage.StorageManager -import java.util.* abstract class AndroidPackageFragmentProviderExtension : PackageFragmentProviderExtension { protected abstract fun getLayoutXmlFileManager(project: Project, moduleInfo: ModuleInfo?): AndroidLayoutXmlFileManager? - private val cache = WeakHashMap() - override fun getPackageFragmentProvider( project: Project, module: ModuleDescriptor, @@ -45,9 +42,6 @@ abstract class AndroidPackageFragmentProviderExtension : PackageFragmentProvider val moduleData = layoutXmlFileManager.getModuleData() - val cachedPackageFragmentProvider = cache[moduleData] - if (cachedPackageFragmentProvider != null) return cachedPackageFragmentProvider - val lazyContext = LazySyntheticElementResolveContext(module, storageManager) val allPackageDescriptors = arrayListOf() @@ -97,9 +91,7 @@ abstract class AndroidPackageFragmentProviderExtension : PackageFragmentProvider allPackageDescriptors += packageDescriptor } - val provider = AndroidSyntheticPackageFragmentProvider(allPackageDescriptors) - cache[moduleData] = provider - return provider + return AndroidSyntheticPackageFragmentProvider(allPackageDescriptors) } }