From 5e6275f1ba512fd624262dbd9eee92c438bf677c Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 7 Aug 2017 16:36:14 +0200
Subject: [PATCH] throw on invokeAndWait in read action to really prevent
 deadlocks like IDEA-168847

---
 .../com/intellij/openapi/application/impl/ApplicationImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
index 0cec29b8083d..3904ac83a095 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
@@ -682,7 +682,7 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App
     }
 
     if (holdsReadLock()) {
-      LOG.error("Calling invokeAndWait from read-action leads to possible deadlock.");
+      throw new IllegalStateException("Calling invokeAndWait from read-action leads to possible deadlock.");
     }
 
     LaterInvocator.invokeAndWait(myTransactionGuard.wrapLaterInvocation(runnable, modalityState), modalityState);