From f9399bf3ea37320fefeefb3858a39699596a1f69 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Tue, 28 Mar 2017 11:09:49 +0200
Subject: [PATCH] avoid deadlock, allowing EDT to read non-final data
 (IDEA-170405)

---
 .../src/com/intellij/coverage/SrcFileAnnotator.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/coverage-common/src/com/intellij/coverage/SrcFileAnnotator.java b/plugins/coverage-common/src/com/intellij/coverage/SrcFileAnnotator.java
index 2621dea74c93..11361fe97d8a 100644
--- a/plugins/coverage-common/src/com/intellij/coverage/SrcFileAnnotator.java
+++ b/plugins/coverage-common/src/com/intellij/coverage/SrcFileAnnotator.java
@@ -202,10 +202,10 @@ public class SrcFileAnnotator implements Disposable {
   @Nullable
   private SoftReference<TIntIntHashMap> doGetLineMapping(final long date, boolean oldToNew, MyEditorBean editorBean) {
     VirtualFile virtualFile = editorBean.getVFile();
+    if (myOldContent == null && ApplicationManager.getApplication().isDispatchThread()) return null;
     final byte[] oldContent;
     synchronized (LOCK) {
       if (myOldContent == null) {
-        if (ApplicationManager.getApplication().isDispatchThread()) return null;
         final LocalHistory localHistory = LocalHistory.getInstance();
         byte[] byteContent = localHistory.getByteContent(virtualFile, new FileRevisionTimestampComparator() {
           public boolean isSuitable(long revisionTimestamp) {