WELD-373

weld · Jan 25, 2010 · f9629b8 · f9629b8
1 parent d3f9eed
commit f9629b8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java b/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
@@ -63,6 +63,7 @@
 import org.jboss.weld.context.SessionContext;
 import org.jboss.weld.context.SingletonContext;
 import org.jboss.weld.context.api.BeanStore;
+import org.jboss.weld.context.beanstore.HashMapBeanStore;
 import org.jboss.weld.conversation.ConversationImpl;
 import org.jboss.weld.conversation.NumericConversationIdGenerator;
 import org.jboss.weld.conversation.ServletConversationManager;
@@ -438,12 +439,23 @@ public void shutdown()
    {
       try
       {
-         BeforeShutdownImpl.fire(deploymentManager, beanDeployments);
+         Container.instance().services().get(ContextLifecycle.class).endApplication();
+         try
+         {
+            // Create a fake application context to service this request
+            Container.instance().services().get(ContextLifecycle.class).beginApplication(new HashMapBeanStore());
+            BeforeShutdownImpl.fire(deploymentManager, beanDeployments);
+            Container.instance().services().get(ContextLifecycle.class).endApplication();
+         }
+         finally
+         {
+
+         }
       }
       finally
       {
          Container.instance().setState(ContainerState.SHUTDOWN);
-         Container.instance().services().get(ContextLifecycle.class).endApplication();
+         Container.instance().cleanup();
       }
    }
 

diff --git a/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java b/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java
@@ -31,7 +31,6 @@
 import static org.jboss.weld.logging.messages.ContextMessage.SESSION_ENDED;
 import static org.jboss.weld.logging.messages.ContextMessage.SESSION_RESTORED;
 
-import org.jboss.weld.Container;
 import org.jboss.weld.bootstrap.api.Lifecycle;
 import org.jboss.weld.bootstrap.api.Service;
 import org.jboss.weld.context.api.BeanStore;
@@ -140,7 +139,6 @@ public void endApplication()
       singletonContext.destroy();
       singletonContext.setActive(false);
       singletonContext.setBeanStore(null);
-      Container.instance().cleanup();
    }
 
    public void cleanup() 

diff --git a/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java b/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java
@@ -102,7 +102,7 @@ public void testContainerEventsOnlySentToExtensionBeans()
       assert extensionObserver.isAfterDeploymentValidation();
       assert extensionObserver.isAllAfterDeploymentValidation();
       assert !otherObserver.isAfterDeploymentValidation();
-      assert !otherObserver.isAllAfterDeploymentValidation(); 
+      assert !otherObserver.isAllAfterDeploymentValidation();
 
    }
 

diff --git a/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java b/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java
@@ -16,7 +16,9 @@
  */
 package org.jboss.weld.tests.extensions;
 import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.BeforeShutdown;
 import javax.enterprise.inject.spi.Extension;
 
 
@@ -34,5 +36,11 @@ public static SimpleExtension getInstance()
    {
       return instance;
    }
+
+   public void observeBeforeShutdown(@Observes BeforeShutdown beforeShutdown, BeanManager beanManager)
+   {
+      assert beanManager != null;
+      assert beanManager.getELResolver() != null;
+   }
 
 }