azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix potential deadlock on lazy vs storage manager

Browse Source
This commit is contained in:
Alexander Udalov
2015-11-20 16:31:53 +03:00
parent caa6cdb3f7
commit fb61dc7e81
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt
+3 -1
View File
@@ -30,7 +30,9 @@ class LazyJavaPackageFragment(
private val c: LazyJavaResolverContext, private val c: LazyJavaResolverContext,
private val jPackage: JavaPackage private val jPackage: JavaPackage
) : PackageFragmentDescriptorImpl(c.module, jPackage.getFqName()) { ) : PackageFragmentDescriptorImpl(c.module, jPackage.getFqName()) {
private val scope by lazy { LazyJavaPackageScope(c, jPackage, this) } private val scope by c.storageManager.createLazyValue {
LazyJavaPackageScope(c, jPackage, this)
}
private val topLevelClasses = c.storageManager.createMemoizedFunctionWithNullableValues { private val topLevelClasses = c.storageManager.createMemoizedFunctionWithNullableValues {
javaClass: JavaClass -> javaClass: JavaClass ->