From 89c45e46df13f43dd17cd8735d03ec2fc1fabe94 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Mon, 16 Jul 2012 12:53:27 +0200
Subject: [PATCH] Components: duplicating component name check corrected

---
 .../openapi/components/impl/stores/ComponentStoreImpl.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java
index 24b7e61451e2..f78903eebd3a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java
@@ -189,9 +189,9 @@ abstract class ComponentStoreImpl implements IComponentStore {
   }
 
   private void doAddComponent(String componentName, Object component) {
-    if (myComponents.containsKey(componentName)) {
-      LOG.error("Conflicting component name '" + componentName  + "': "
-                + myComponents.get(componentName).getClass() + " and " + component.getClass());
+    Object existing = myComponents.get(componentName);
+    if (existing != null && existing != component) {
+      LOG.error("Conflicting component name '" + componentName + "': " + existing.getClass() + " and " + component.getClass());
     }
     myComponents.put(componentName, component);
   }