[webbeans-commits] Webbeans SVN: r416 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/servlet and 1 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Fri Dec 5 07:36:39 EST 2008
Author: pete.muir at jboss.org
Date: 2008-12-05 07:36:39 -0500 (Fri, 05 Dec 2008)
New Revision: 416
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java
Log:
destroy normal contexts
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java 2008-12-05 12:17:38 UTC (rev 415)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java 2008-12-05 12:36:39 UTC (rev 416)
@@ -23,7 +23,6 @@
import javax.webbeans.manager.Bean;
import javax.webbeans.manager.Context;
import javax.webbeans.manager.Contextual;
-import javax.webbeans.manager.Manager;
/**
* Base for the Context implementations. Delegates calls to the abstract
@@ -126,18 +125,16 @@
this.active.set(Boolean.valueOf(active));
}
- // TODO Do we need this
- private <T> void destroy(Manager manager, Contextual<T> bean)
+ private <T> void destroy(Contextual<T> bean)
{
bean.destroy(getBeanMap().get(bean));
}
- // TODO Do we need this
- public void destroy(Manager manager)
+ public void destroy()
{
for (Contextual<? extends Object> bean : getBeanMap().keySet())
{
- destroy(manager, bean);
+ destroy(bean);
}
getBeanMap().clear();
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2008-12-05 12:17:38 UTC (rev 415)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2008-12-05 12:36:39 UTC (rev 416)
@@ -27,6 +27,7 @@
import org.jboss.webbeans.bootstrap.Bootstrap;
import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
import org.jboss.webbeans.contexts.ApplicationContext;
+import org.jboss.webbeans.contexts.RequestContext;
import org.jboss.webbeans.contexts.SessionContext;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
@@ -64,6 +65,7 @@
*/
public static void endApplication()
{
+ ApplicationContext.instance().destroy();
ApplicationContext.instance().setBeanMap(null);
servletContext = null;
}
@@ -84,6 +86,8 @@
*/
public static void endSession(HttpSession session)
{
+ SessionContext.instance().destroy();
+ SessionContext.instance().setBeanMap(null);
}
/**
@@ -105,6 +109,7 @@
*/
public static void endRequest(HttpServletRequest request)
{
+ RequestContext.instance().destroy();
SessionContext.instance().setBeanMap(null);
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java 2008-12-05 12:17:38 UTC (rev 415)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/model/EnterpriseBeanRemoveMethodTest.java 2008-12-05 12:36:39 UTC (rev 416)
@@ -46,7 +46,7 @@
EnterpriseBean<Toller> bena = BeanFactory.createEnterpriseBean(Toller.class);
RequestContext context = (RequestContext) manager.getContext(RequestScoped.class);
Toller instance = context.get(bena, true);
- context.destroy(manager);
+ context.destroy();
assert EnterpriseBeanRemoveMethodTest.tickle;
}
@@ -72,7 +72,7 @@
Toller instance = manager.getInstance(bean);
RequestContext context = (RequestContext) manager
.getContext(RequestScoped.class);
- context.destroy(manager);
+ context.destroy();
}
@Test(groups={"enterpriseBeans", "removeMethod", "lifecycle", "stub"})
More information about the weld-commits
mailing list