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

Correctly return existing provider if it is there

Browse Source
This commit is contained in:
Andrey Breslav
2013-01-30 18:18:52 +04:00
parent 5eb173e8dd
commit fd6cb970e4
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/FileBasedDeclarationProviderFactory.java
+9 -4
View File
@@ -109,9 +109,9 @@ public class FileBasedDeclarationProviderFactory implements DeclarationProviderF
@Override @Override
public PackageMemberDeclarationProvider getPackageMemberDeclarationProvider(@NotNull FqName packageFqName) { public PackageMemberDeclarationProvider getPackageMemberDeclarationProvider(@NotNull FqName packageFqName) {
PackageMemberDeclarationProvider declarationProvider = packageDeclarationProviders.get(packageFqName); PackageMemberDeclarationProvider cached = packageDeclarationProviders.get(packageFqName);
if (declarationProvider != null) { if (cached != null) {
return declarationProvider; return cached;
} }
if (!isPackageDeclaredExplicitly(packageFqName)) { if (!isPackageDeclaredExplicitly(packageFqName)) {
@@ -124,7 +124,12 @@ public class FileBasedDeclarationProviderFactory implements DeclarationProviderF
FileBasedPackageMemberDeclarationProvider provider = FileBasedPackageMemberDeclarationProvider provider =
new FileBasedPackageMemberDeclarationProvider(storageManager, packageFqName, this, index.get().filesByPackage.get(packageFqName)); new FileBasedPackageMemberDeclarationProvider(storageManager, packageFqName, this, index.get().filesByPackage.get(packageFqName));
return packageDeclarationProviders.putIfAbsent(packageFqName, provider); PackageMemberDeclarationProvider oldValue = packageDeclarationProviders.putIfAbsent(packageFqName, provider);
if (oldValue != null) {
return oldValue;
}
return provider;
} }
@NotNull @NotNull