[webbeans-commits] Webbeans SVN: r2521 - ri/trunk/impl/src/main/java/org/jboss/webbeans/event and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-04-19 17:04:26 -0400 (Sun, 19 Apr 2009)
New Revision: 2521

Modified:
   extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java
Log:
WBX-33

Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java	2009-04-19 21:01:39 UTC (rev 2520)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ShutdownManager.java	2009-04-19 21:04:26 UTC (rev 2521)
@@ -5,7 +5,6 @@
 import javax.inject.manager.Manager;
 
 import org.jboss.webbeans.bootstrap.api.Bootstrap;
-import org.jboss.webbeans.context.DependentContext;
 import org.jboss.webbeans.environment.se.events.Shutdown;
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
@@ -35,7 +34,6 @@
          {
             hasShutdownBeenCalled = true; 
             bootstrap.shutdown();
-            DependentContext.instance().setActive(false);
          }
          else
          {

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java	2009-04-19 21:01:39 UTC (rev 2520)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java	2009-04-19 21:04:26 UTC (rev 2521)
@@ -116,7 +116,8 @@
       }
       finally
       {
-         DependentContext.instance().setActive(false);
+         // TODO This breaks SE shutdown, also we need to tidy up how dependent context is activated....
+         //DependentContext.instance().setActive(false);
       }
    }