[webbeans-commits] Webbeans SVN: r306 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: bootstrap and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: nickarls
Date: 2008-11-14 03:05:09 -0500 (Fri, 14 Nov 2008)
New Revision: 306

Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/Bootstrap.java
Log:
Change bootstrapper to use bulk setBeans

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java	2008-11-13 12:59:29 UTC (rev 305)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java	2008-11-14 08:05:09 UTC (rev 306)
@@ -29,6 +29,7 @@
 import javax.webbeans.manager.Interceptor;
 import javax.webbeans.manager.Manager;
 
+import org.jboss.webbeans.bean.AbstractBean;
 import org.jboss.webbeans.bean.SimpleBean;
 import org.jboss.webbeans.bean.proxy.ProxyPool;
 import org.jboss.webbeans.contexts.ApplicationContext;
@@ -215,10 +216,10 @@
     * 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) {
+   public Manager setBeans(Set<AbstractBean<?, ?>> beans) {
       this.beans = new CopyOnWriteArrayList<Bean<?>>(beans);
+      getResolutionManager().clear();
       return this;
    }
    

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/Bootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/Bootstrap.java	2008-11-13 12:59:29 UTC (rev 305)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/Bootstrap.java	2008-11-14 08:05:09 UTC (rev 306)
@@ -95,10 +95,7 @@
    public void registerBeans(Set<Class<?>> classes)
    {
       Set<AbstractBean<?, ?>> beans = createBeans(classes);
-      for (Bean<?> bean : beans)
-      {
-         manager.addBean(bean);
-      }
+      manager.setBeans(beans);
    }
    
    /**