avoid deadlock, allowing EDT to read non-final data (IDEA-170405)

This commit is contained in:
Anna.Kozlova
2017-03-28 11:16:35 +02:00
parent 34946b6f80
commit f9399bf3ea
@@ -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) {