From c42fc2ad453711a8fd50db045dae2e169f026564 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 27 Jul 2016 14:02:44 +0300 Subject: [PATCH] Do not warn about getting service from under write action in tests. Too many positives. --- .../openapi/components/impl/ServiceManagerImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/ServiceManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/ServiceManagerImpl.java index d810f1fe583a..0218a4370249 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/ServiceManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/ServiceManagerImpl.java @@ -222,7 +222,11 @@ public class ServiceManagerImpl implements BaseComponent { ComponentAdapter delegate = getDelegate(); // useReadActionToInitService is enabled currently only in internal or test mode or explicitly (registry) - we have enough feedback to fix, so, don't disturb all users - if (!useReadActionToInitService && LOG.isDebugEnabled() && ApplicationManager.getApplication().isWriteAccessAllowed() && PersistentStateComponent.class.isAssignableFrom(delegate.getComponentImplementation())) { + if (!useReadActionToInitService && + LOG.isDebugEnabled() && + ApplicationManager.getApplication().isWriteAccessAllowed() && + !ApplicationManager.getApplication().isUnitTestMode() && + PersistentStateComponent.class.isAssignableFrom(delegate.getComponentImplementation())) { LOG.warn(new Throwable("Getting service from write-action leads to possible deadlock. Service implementation " + myDescriptor.getImplementation())); }