From 34c0fc0876fb3814a8b457115b03f979656adafe Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Thu, 24 Aug 2017 21:59:13 +0300 Subject: [PATCH] [vcs-log] add assertion to ensure background log disposal --- .../impl/src/com/intellij/vcs/log/impl/VcsLogManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java index 138e9e8fba90..43ebde0166e2 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java @@ -182,6 +182,10 @@ public class VcsLogManager implements Disposable { @Override public void dispose() { + // since disposing log triggers flushing indexes on disk we do not want to do it in EDT + // disposing of VcsLogManager is done by manually executing dispose(@Nullable Runnable callback) + // the above method first disposes ui in EDT, than disposes everything else in background + LOG.assertTrue(!ApplicationManager.getApplication().isDispatchThread()); } private class MyFatalErrorsHandler implements FatalErrorHandler {