[weld-commits] Weld SVN: r5412 - in core/trunk/impl/src/main/java/org/jboss/weld/bootstrap: events and 1 other directory.
Author: pete.muir(a)jboss.org
Date: 2010-01-10 11:55:26 -0500 (Sun, 10 Jan 2010)
New Revision: 5412
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeShutdownImpl.java
Log:
call beforeshutdown for all bean archives in the deployment
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2010-01-10
14:09:51 UTC (rev 5411)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2010-01-10
16:55:26 UTC (rev 5412)
@@ -39,8 +39,8 @@
import javax.enterprise.inject.spi.Extension;
import org.jboss.weld.Container;
+import org.jboss.weld.ContainerState;
import org.jboss.weld.ContextualStoreImpl;
-import org.jboss.weld.ContainerState;
import org.jboss.weld.bean.builtin.BeanManagerBean;
import org.jboss.weld.bootstrap.api.Bootstrap;
import org.jboss.weld.bootstrap.api.Environment;
@@ -438,7 +438,7 @@
{
try
{
- BeforeShutdownImpl.fire(deploymentManager);
+ BeforeShutdownImpl.fire(deploymentManager, beanDeployments);
}
finally
{
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeShutdownImpl.java
===================================================================
---
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeShutdownImpl.java 2010-01-10
14:09:51 UTC (rev 5411)
+++
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeShutdownImpl.java 2010-01-10
16:55:26 UTC (rev 5412)
@@ -16,8 +16,12 @@
*/
package org.jboss.weld.bootstrap.events;
+import java.util.Map;
+
import javax.enterprise.inject.spi.BeforeShutdown;
+import org.jboss.weld.bootstrap.BeanDeployment;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
import org.jboss.weld.manager.BeanManagerImpl;
/**
@@ -27,9 +31,17 @@
public class BeforeShutdownImpl extends AbstractContainerEvent implements BeforeShutdown
{
- public static void fire(BeanManagerImpl beanManager)
+ public static void fire(BeanManagerImpl beanManager, Map<BeanDeploymentArchive,
BeanDeployment> beanDeployments)
{
- new BeforeShutdownImpl(beanManager).fire();
+ if (beanDeployments == null)
+ {
+ // Shutdown may have been called with an early-failure, before beanDeployments
is built
+ new BeforeShutdownImpl(beanManager).fire();
+ }
+ else
+ {
+ new BeforeShutdownImpl(beanManager).fire(beanDeployments);
+ }
}
public BeforeShutdownImpl(BeanManagerImpl beanManager)