From 4657567484d8b38098ff29ad15e39b91fc183bf9 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Sat, 16 Jun 2012 02:24:11 +0400 Subject: [PATCH] check state in WriteableScopeImpl (nothing is written to allDescriptor after getAllDescriptors fetched) --- .../jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java index 0921b61a23d..3d7fdbcbd74 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java @@ -131,6 +131,10 @@ public class WritableScopeImpl extends WritableScopeWithImports { if (!allDescriptorsDone) { allDescriptorsDone = true; + + // make sure no descriptors added to allDescriptors collection + changeLockLevel(LockLevel.READING); + allDescriptors.addAll(getWorkerScope().getAllDescriptors()); for (JetScope imported : getImports()) { allDescriptors.addAll(imported.getAllDescriptors());