From ac8cc7607cc370ee8095bb1dcc3817c2c801c21f Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 8 May 2015 10:05:04 +0200 Subject: [PATCH] FileBasedIndexImpl: a more humble assertion in tests --- .../com/intellij/util/indexing/FileBasedIndexImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java index a2cd3a6e7335..37eaeac9fb7e 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java @@ -25,10 +25,7 @@ import com.intellij.notification.NotificationDisplayType; import com.intellij.notification.NotificationGroup; import com.intellij.notification.NotificationType; import com.intellij.openapi.actionSystem.ex.ActionUtil; -import com.intellij.openapi.application.ApplicationAdapter; -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.ModalityState; -import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.application.*; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.impl.EditorHighlighterCache; @@ -1554,7 +1551,8 @@ public class FileBasedIndexImpl extends FileBasedIndex { boolean requiresRebuildWasSet = ourRebuildStatus.get(indexId).compareAndSet(OK, REQUIRES_REBUILD); if (requiresRebuildWasSet) { String message = "Rebuild requested for index " + indexId; - if (ApplicationManager.getApplication().isUnitTestMode()) { + Application app = ApplicationManager.getApplication(); + if (app.isUnitTestMode() && app.isReadAccessAllowed() && !app.isDispatchThread()) { LOG.error(message, throwable); } else { LOG.info(message, throwable);