[364000] Deadlock in ManagedContainer

https://bugs.eclipse.org/bugs/show_bug.cgi?id=364000

1 files changed, 11 insertions, 9 deletions

diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
index fa13fa4882..1ae7ef4e99 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ManagedContainer.java
@@ -276,17 +276,19 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
     synchronized (elementRegistry)
     {
       element = elementRegistry.get(key);
-      if (element == null)
-      {
-        element = createElement(productGroup, factoryType, description);
-        element = postProcessElement(productGroup, factoryType, description, element);
-        if (activate)
-        {
-          LifecycleUtil.activate(element);
-        }
+    }
 
-        putElement(key, element);
+    if (element == null)
+    {
+      element = createElement(productGroup, factoryType, description);
+      element = postProcessElement(productGroup, factoryType, description, element);
+
+      if (activate)
+      {
+        LifecycleUtil.activate(element);
       }
+
+      putElement(key, element);
     }
 
     return element;