Do a deep copy on observers

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2305 1c488680-804c-0410-94cd-c6b725194a0e
weld · Apr 5, 2009 · acae34d · acae34d
1 parent 85bdd02
commit acae34d
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 1 deletion.
diff --git a/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java b/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java
@@ -188,7 +188,7 @@ public static ManagerImpl newChildManager(ManagerImpl parentManager)
       beans.addAll(parentManager.getBeans());
 
       ConcurrentSetMultiMap<Type, EventObserver<?>> registeredObservers = new ConcurrentSetHashMultiMap<Type, EventObserver<?>>();
-      registeredObservers.putAll(parentManager.getRegisteredObservers());
+      registeredObservers.deepPutAll(parentManager.getRegisteredObservers());
       Namespace rootNamespace = new Namespace(parentManager.getRootNamespace());
 
       return new ManagerImpl(

diff --git a/impl/src/main/java/org/jboss/webbeans/util/collections/ConcurrentList.java b/impl/src/main/java/org/jboss/webbeans/util/collections/ConcurrentList.java
@@ -16,6 +16,7 @@
  */
 package org.jboss.webbeans.util.collections;
 
+import java.util.Collection;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
@@ -38,5 +39,22 @@ public static <E> ConcurrentList<E> emptyList()
    }
 
    private static final long serialVersionUID = -7489797765014324457L;
+
+   public ConcurrentList()
+   {
+      super();
+   }
+
+   public ConcurrentList(Collection<? extends E> collection)
+   {
+      super(collection);
+   }
+
+   public ConcurrentList(E[] array)
+   {
+      super(array);
+   }
+
+
 
 }
diff --git a/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ConcurrentListHashMultiMap.java b/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ConcurrentListHashMultiMap.java
@@ -16,6 +16,7 @@
  */
 package org.jboss.webbeans.util.collections.multi;
 
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -49,6 +50,14 @@ protected ConcurrentMap<K, ConcurrentList<V>> delegate()
    {
       return delegate;
    }
+
+   public void deepPutAll(Map<? extends K, ? extends ConcurrentList<V>> map)
+   {
+      for (Entry<? extends K, ? extends ConcurrentList<V>> entry : map.entrySet())
+      {
+         put(entry.getKey(), new ConcurrentList<V>(entry.getValue()));
+      }
+   }
 
    /**
     * Gets the list of values for a given key

diff --git a/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ConcurrentListMultiMap.java b/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ConcurrentListMultiMap.java
@@ -16,6 +16,7 @@
  */
 package org.jboss.webbeans.util.collections.multi;
 
+import java.util.Map;
 import java.util.concurrent.ConcurrentMap;
 
 import org.jboss.webbeans.util.collections.ConcurrentList;
@@ -37,4 +38,12 @@ public interface ConcurrentListMultiMap<K, V> extends ConcurrentMap<K, Concurren
     */
    public void put(K key, V value);
 
+   /**
+    * Put all the data in the map into this map, copying each multi-value, not
+    * just attaching the existing multi-value
+    * 
+    * @param map the map to copy
+    */
+   public void deepPutAll(Map<? extends K, ? extends ConcurrentList<V>> map);
+
 }
diff --git a/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ConcurrentSetHashMultiMap.java b/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ConcurrentSetHashMultiMap.java
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 import java.util.Collections;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -44,6 +45,14 @@ public ConcurrentSetHashMultiMap()
    {
       delegate = new ConcurrentHashMap<K, Set<V>>();
    }
+
+   public void deepPutAll(Map<? extends K, ? extends Set<V>> map)
+   {
+      for (Entry<? extends K, ? extends Set<V>> entry : map.entrySet())
+      {
+         put(entry.getKey(), new CopyOnWriteArraySet<V>(entry.getValue()));
+      }
+   }
 
    @Override
    protected ConcurrentMap<K, Set<V>> delegate()

diff --git a/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ConcurrentSetMultiMap.java b/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ConcurrentSetMultiMap.java
@@ -16,6 +16,7 @@
  */
 package org.jboss.webbeans.util.collections.multi;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 
@@ -37,5 +38,13 @@ public interface ConcurrentSetMultiMap<K, V> extends ConcurrentMap<K, Set<V>>
     * @param value the value to add
     */
    public void put(K key, V value);
+
+   /**
+    * Put all the data in the map into this map, copying each multi-value, not
+    * just attaching the existing multi-value
+    * 
+    * @param map the map to copy
+    */
+   public void deepPutAll(Map<? extends K, ? extends Set<V>> map);
 
 }
diff --git a/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ListHashMultiMap.java b/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ListHashMultiMap.java
@@ -50,6 +50,14 @@ protected Map<K, List<V>> delegate()
    {
       return delegate;
    }
+
+   public void deepPutAll(Map<? extends K, ? extends List<V>> map)
+   {
+      for (Entry<? extends K, ? extends List<V>> entry : map.entrySet())
+      {
+         put(entry.getKey(), new ArrayList<V>(entry.getValue()));
+      }
+   }
 
    /**
     * Gets the list of values for a given key

diff --git a/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ListMultiMap.java b/impl/src/main/java/org/jboss/webbeans/util/collections/multi/ListMultiMap.java
@@ -35,4 +35,12 @@ public interface ListMultiMap<K, V> extends Map<K, List<V>>
     */
    public void put(K key, V value);
 
+   /**
+    * Put all the data in the map into this map, copying each multi-value, not
+    * just attaching the existing multi-value
+    * 
+    * @param map the map to copy
+    */
+   public void deepPutAll(Map<? extends K, ? extends List<V>> map);
+
 }
diff --git a/impl/src/main/java/org/jboss/webbeans/util/collections/multi/SetHashMultiMap.java b/impl/src/main/java/org/jboss/webbeans/util/collections/multi/SetHashMultiMap.java
@@ -50,6 +50,14 @@ protected Map<K, Set<V>> delegate()
    {
       return delegate;
    }
+
+   public void deepPutAll(Map<? extends K, ? extends Set<V>> map)
+   {
+      for (Entry<? extends K, ? extends Set<V>> entry : map.entrySet())
+      {
+         put(entry.getKey(), new HashSet<V>(entry.getValue()));
+      }
+   }
 
    /**
     * Gets the list of values for a given key

diff --git a/impl/src/main/java/org/jboss/webbeans/util/collections/multi/SetMultiMap.java b/impl/src/main/java/org/jboss/webbeans/util/collections/multi/SetMultiMap.java
@@ -37,4 +37,12 @@ public interface SetMultiMap<K, V> extends Map<K, Set<V>>
     */
    public void put(K key, V value);
 
+   /**
+    * Put all the data in the map into this map, copying each multi-value, not
+    * just attaching the existing multi-value
+    * 
+    * @param map the map to copy
+    */
+   public void deepPutAll(Map<? extends K, ? extends Set<V>> map);
+
 }