From ed81102b2f540d68cb4963dba3c017387e254339 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Thu, 27 Feb 2014 16:24:53 +0400
Subject: [PATCH] Minor. Name clash removed (workaround for KT-1)

---
 .../lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt
index 64b1f7ab7e1..65df1bbc6f2 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt
@@ -40,7 +40,7 @@ public abstract class LazyJavaMemberScope(
         protected val c: LazyJavaResolverContextWithTypes,
         private val _containingDeclaration: DeclarationDescriptor
 ) : JetScope {
-    private val allDescriptors = c.storageManager.createRecursionTolerantLazyValue<Collection<DeclarationDescriptor>>(
+    private val _allDescriptors = c.storageManager.createRecursionTolerantLazyValue<Collection<DeclarationDescriptor>>(
             {computeAllDescriptors()},
             // This is to avoid the following recursive case:
             //    when computing getAllPackageNames() we ask the JavaPsiFacade for all subpackages of foo
@@ -309,7 +309,7 @@ public abstract class LazyJavaMemberScope(
     override fun getDeclarationsByLabel(labelName: LabelName) = listOf<DeclarationDescriptor>()
 
     override fun getOwnDeclaredDescriptors() = getAllDescriptors()
-    override fun getAllDescriptors() = allDescriptors()
+    override fun getAllDescriptors() = _allDescriptors()
 
     private fun computeAllDescriptors(): MutableCollection<DeclarationDescriptor> {
         val result = LinkedHashSet<DeclarationDescriptor>()