BeanMap backing Map -> ConcurrentHashMap

CopyOnWriteArrayList setter for beans in Manager

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@226 1c488680-804c-0410-94cd-c6b725194a0e

webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java

@@ -3,6 +3,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -195,6 +196,18 @@ public ResolutionManager getResolutionManager()
       return resolutionManager;
    }
 
+   /**
+    * Wraps a collection of beans into a thread safe list.
+    * Since this overwrites any existing list of beans in the manager,
+    * this should only be done on startup and other controlled situations.
+    * 
+    * @param beans The collection of beans to wrap.
+    */
+   public Manager setBeans(Collection<Bean<?>> beans) {
+      this.beans = new CopyOnWriteArrayList<Bean<?>>(beans);
+      return this;
+   }
+
    public List<Bean<?>> getBeans()
    {
       return beans;

webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java

@@ -1,7 +1,7 @@
 package org.jboss.webbeans.contexts;
 
 import java.lang.annotation.Annotation;
-import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.webbeans.manager.Bean;
 import javax.webbeans.manager.Context;
@@ -22,10 +22,10 @@ public abstract class AbstractContext implements Context
 
    protected class BeanMap extends MapWrapper<Bean<? extends Object>, Object>
    {
-
+      
       public BeanMap()
       {
-         super(new HashMap<Bean<? extends Object>, Object>());
+         super(new ConcurrentHashMap<Bean<? extends Object>, Object>());
       }
 
       @SuppressWarnings("unchecked")

webbeans-ri/src/main/java/org/jboss/webbeans/util/ProxyMethodHandler.java

@@ -2,7 +2,6 @@
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
-import java.util.List;
 
 import javassist.util.proxy.MethodHandler;
 
@@ -26,7 +25,6 @@ public ProxyMethodHandler(Bean<?> bean, int beanIndex, ManagerImpl manager)
       ProxyMethodHandler.manager = manager;
    }
 
-   //@Override Let's stay compatible with JDK5 :-)
    public Object invoke(Object self, Method method, Method proceed, Object[] args) throws Throwable
    {
       if (bean == null)

webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java

@@ -60,7 +60,14 @@ public void testManagerLookupInJndi()
    {
       assert false;
    }
-
+
+   @Test(groups="manager")
+   public void testWrappingOfBeanCollection() 
+   {
+      // TODO stub
+      assert false;
+   }
+
    /*
    
    @Test(groups="manager") @SpecAssertion(section="4.8")

webbeans-ri/src/test/java/org/jboss/webbeans/test/CommonContextTest.java → webbeans-ri/src/test/java/org/jboss/webbeans/test/NormalContextTest.java

@@ -30,7 +30,7 @@
  *
  */
 @SpecVersion("PDR")
-public class CommonContextTest extends AbstractTest
+public class NormalContextTest extends AbstractTest
 {
    Context context;
 
@@ -83,4 +83,11 @@ public void testDestroy() {
       ((AbstractContext)context).destroy(manager);
       assert context.get(tunaBean, false) == null;
    }
+
+   @Test(groups="contexts")
+   public void testThreadSafety() {
+      //TODO stub
+      assert false;
+   }
+
 }

webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java

@@ -3,7 +3,6 @@
 import static org.jboss.webbeans.test.util.Util.createSimpleWebBean;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;