From 514e4e8ee4bece81fdc6ed70466b5e94a6f6c698 Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Wed, 1 Apr 2015 15:04:46 +0300
Subject: [PATCH] IDEA-137521 [groovy] synchronized state loading of dsl
 activation

---
 .../plugins/groovy/dsl/DslActivationStatus.java | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/DslActivationStatus.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/DslActivationStatus.java
index 3ba77bcf9783..1c8e29e30f83 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/DslActivationStatus.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/DslActivationStatus.java
@@ -89,13 +89,16 @@ public class DslActivationStatus implements PersistentStateComponent<DslActivati
 
   @Override
   public void loadState(State state) {
-    if (state.entries == null) return;
-    final VirtualFileManager fileManager = VirtualFileManager.getInstance();
-    for (Entry entry : state.entries) {
-      if (entry.url == null || entry.status == null) continue;
-      final VirtualFile file = fileManager.findFileByUrl(entry.url);
-      if (file != null) {
-        myStatus.put(file, entry);
+    synchronized (myStatus) {
+      myStatus.clear();
+      if (state.entries == null) return;
+      final VirtualFileManager fileManager = VirtualFileManager.getInstance();
+      for (Entry entry : state.entries) {
+        if (entry.url == null || entry.status == null) continue;
+        final VirtualFile file = fileManager.findFileByUrl(entry.url);
+        if (file != null) {
+          myStatus.put(file, entry);
+        }
       }
     }
   }