From 3031ab0227bc63f2c7d72b64ac3ef48e9c8957d5 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Sat, 25 Jun 2016 16:35:38 +0200
Subject: [PATCH] synchronize on model to avoid concurrency problems, 2

---
 .../src/com/intellij/find/impl/FindManagerImpl.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
index 65f871303e05..36d63200b51c 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
@@ -382,12 +382,14 @@ public class FindManagerImpl extends FindManager {
       return null;
     }
 
-    FindExceptCommentsOrLiteralsData data = model.getUserData(ourExceptCommentsOrLiteralsDataKey);
-    if (data == null || !data.isAcceptableFor(model, file, text)) {
-      model.putUserData(ourExceptCommentsOrLiteralsDataKey, data = new FindExceptCommentsOrLiteralsData(file, model, text));
-    }
+    synchronized (model) {
+      FindExceptCommentsOrLiteralsData data = model.getUserData(ourExceptCommentsOrLiteralsDataKey);
+      if (data == null || !data.isAcceptableFor(model, file, text)) {
+        model.putUserData(ourExceptCommentsOrLiteralsDataKey, data = new FindExceptCommentsOrLiteralsData(file, model, text));
+      }
 
-    return data;
+      return data;
+    }
   }
 
   @Override