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

Replaced synchronized method with synchronizing on internal lock object.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-05-11 20:16:25 +04:00
parent ec021e05c8
commit b56874e119
1 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java
+33 -29
View File
@@ -48,6 +48,8 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized") @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
private BindingContext bindingContext = null; private BindingContext bindingContext = null;
private final Object lock = new Object();
public StandardLibraryReferenceResolver(Project project) { public StandardLibraryReferenceResolver(Project project) {
super(project); super(project);
} }
@@ -62,36 +64,38 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
}); });
} }
private synchronized void ensureInitialized() { private void ensureInitialized() {
if (bindingContext != null) { synchronized (lock) {
return; if (bindingContext != null) {
return;
}
BindingTraceContext context = new BindingTraceContext();
NamespaceDescriptorImpl fakeRootNamespace = new NamespaceDescriptorImpl(new ModuleDescriptor("<fake_module>"),
Collections.<AnnotationDescriptor>emptyList(), "<root>");
NamespaceDescriptorImpl jetNamespace = new NamespaceDescriptorImpl(fakeRootNamespace,
Collections.<AnnotationDescriptor>emptyList(), "jet");
context.record(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, new FqName("jet"), jetNamespace);
WritableScopeImpl scope = new WritableScopeImpl(JetScope.EMPTY, jetNamespace, RedeclarationHandler.THROW_EXCEPTION)
.setDebugName("Builtin classes scope");
scope.changeLockLevel(WritableScope.LockLevel.BOTH);
jetNamespace.initialize(scope);
TopDownAnalyzer.processStandardLibraryNamespace(myProject, context, scope, jetNamespace, getJetFiles("jet.src"));
ClassDescriptor tuple0 = context.get(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, new FqName("jet.Tuple0"));
assert tuple0 != null;
scope = new WritableScopeImpl(scope, jetNamespace, RedeclarationHandler.THROW_EXCEPTION).setDebugName("Builtin classes scope #2");
scope.changeLockLevel(WritableScope.LockLevel.BOTH);
scope.addClassifierAlias("Unit", tuple0);
jetNamespace.initialize(scope);
TopDownAnalyzer.processStandardLibraryNamespace(myProject, context, scope, jetNamespace, getJetFiles("jet"));
AnalyzingUtils.throwExceptionOnErrors(context.getBindingContext());
bindingContext = context.getBindingContext();
} }
BindingTraceContext context = new BindingTraceContext();
NamespaceDescriptorImpl fakeRootNamespace = new NamespaceDescriptorImpl(new ModuleDescriptor("<fake_module>"),
Collections.<AnnotationDescriptor>emptyList(), "<root>");
NamespaceDescriptorImpl jetNamespace = new NamespaceDescriptorImpl(fakeRootNamespace,
Collections.<AnnotationDescriptor>emptyList(), "jet");
context.record(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, new FqName("jet"), jetNamespace);
WritableScopeImpl scope = new WritableScopeImpl(JetScope.EMPTY, jetNamespace, RedeclarationHandler.THROW_EXCEPTION)
.setDebugName("Builtin classes scope");
scope.changeLockLevel(WritableScope.LockLevel.BOTH);
jetNamespace.initialize(scope);
TopDownAnalyzer.processStandardLibraryNamespace(myProject, context, scope, jetNamespace, getJetFiles("jet.src"));
ClassDescriptor tuple0 = context.get(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, new FqName("jet.Tuple0"));
assert tuple0 != null;
scope = new WritableScopeImpl(scope, jetNamespace, RedeclarationHandler.THROW_EXCEPTION).setDebugName("Builtin classes scope #2");
scope.changeLockLevel(WritableScope.LockLevel.BOTH);
scope.addClassifierAlias("Unit", tuple0);
jetNamespace.initialize(scope);
TopDownAnalyzer.processStandardLibraryNamespace(myProject, context, scope, jetNamespace, getJetFiles("jet"));
AnalyzingUtils.throwExceptionOnErrors(context.getBindingContext());
bindingContext = context.getBindingContext();
} }
private List<JetFile> getJetFiles(String dir) { private List<JetFile> getJetFiles(String dir) {