From c7ee00c85bde53f19ced9a7b2c04f363b4c2bbab Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Tue, 6 Mar 2012 20:03:26 +0400 Subject: [PATCH] fix NPE in tests --- .../intellij/openapi/components/impl/ComponentManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java b/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java index c26dd1c90dc2..ef99dd9ca491 100644 --- a/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java +++ b/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java @@ -160,7 +160,7 @@ public abstract class ComponentManagerImpl extends UserDataHolderBase implements //} synchronized (this) { - if (!myComponentsRegistry.containsInterface(interfaceClass)) { + if (myComponentsRegistry == null || !myComponentsRegistry.containsInterface(interfaceClass)) { return null; }