svn commit: r1205865 - /aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java

[gn...@apache.org]

Author: gnodet
Date: Thu Nov 24 15:07:49 2011
New Revision: 1205865

URL: http://svn.apache.org/viewvc?rev=1205865&view=rev
Log:
[ARIES-788] Possible NPE when destryoing the extender

Modified:
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java?rev=1205865&r1=1205864&r2=1205865&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java Thu Nov 24 15:07:49 2011
@@ -25,10 +25,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
@@ -92,7 +92,7 @@ public class BlueprintExtender implement
           }
         });
         eventDispatcher = new BlueprintEventDispatcher(ctx, executors);
-        containers = new HashMap<Bundle, BlueprintContainerImpl>();
+        containers = new ConcurrentHashMap<Bundle, BlueprintContainerImpl>();
 
         int stateMask = Bundle.INSTALLED | Bundle.RESOLVED | Bundle.STARTING | Bundle.ACTIVE
         | Bundle.STOPPING;