explicitly clean up statics on shutdown

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2344 1c488680-804c-0410-94cd-c6b725194a0e
weld · Apr 8, 2009 · 89eeb37 · 89eeb37
1 parent 22b0bfe
commit 89eeb37
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 23 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/CurrentManager.java b/impl/src/main/java/org/jboss/webbeans/CurrentManager.java
@@ -30,25 +30,24 @@ public class CurrentManager
 {
 
    // The root manager instance
-   private static Integer rootManagerId;
+   private static ManagerImpl rootManager;
 
    private final static Map<Integer, ManagerImpl> managers = new ConcurrentHashMap<Integer, ManagerImpl>();
 
+   public static void cleanup()
+   {
+      rootManager = null;
+      managers.clear();
+   }
+
    /**
     * Gets the root manager
     * 
     * @return The root manager
     */
    public static ManagerImpl rootManager()
    {
-      if (rootManagerId == null)
-      {
-         return null;
-      }
-      else
-      {
-         return managers.get(rootManagerId);
-      }
+      return rootManager;
    }
 
    /**
@@ -58,14 +57,8 @@ public static ManagerImpl rootManager()
     */
    public static void setRootManager(ManagerImpl managerImpl) 
    {
-      if (managerImpl == null)
-      {
-         rootManagerId = null;
-      }
-      else
-      {
-         rootManagerId = add(managerImpl);
-      }
+      rootManager = managerImpl;
+      managers.put(managerImpl.getId(), managerImpl);
    }
 
    public static ManagerImpl get(Integer key)

diff --git a/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java b/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java
@@ -1129,6 +1129,7 @@ public void shutdown()
    {
       log.trace("Ending application");
       shutdownExecutors();
+      CurrentManager.cleanup();
       ApplicationContext.INSTANCE.destroy();
       ApplicationContext.INSTANCE.setActive(false);
       ApplicationContext.INSTANCE.setBeanStore(null);

diff --git a/impl/src/main/java/org/jboss/webbeans/mock/MockServletLifecycle.java b/impl/src/main/java/org/jboss/webbeans/mock/MockServletLifecycle.java
@@ -56,7 +56,7 @@ public void beginApplication()
 
    public void endApplication()
    {
-
+      bootstrap.shutdown();
    }
 
    public void resetContexts()

diff --git a/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java b/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java
@@ -6,7 +6,6 @@
 
 import org.jboss.testharness.api.DeploymentException;
 import org.jboss.testharness.spi.StandaloneContainers;
-import org.jboss.webbeans.CurrentManager;
 import org.jboss.webbeans.ManagerImpl;
 import org.jboss.webbeans.mock.MockEELifecycle;
 import org.jboss.webbeans.mock.MockWebBeanDiscovery;
@@ -74,7 +73,6 @@ public void undeploy()
       lifecycle.endRequest();
       lifecycle.endSession();
       lifecycle.endApplication();
-      CurrentManager.setRootManager(null);
       lifecycle = null;
    }
 

diff --git a/tests/src/main/java/org/jboss/webbeans/test/StandaloneContainersImpl.java b/tests/src/main/java/org/jboss/webbeans/test/StandaloneContainersImpl.java
@@ -4,7 +4,6 @@
 
 import org.jboss.testharness.api.DeploymentException;
 import org.jboss.testharness.spi.StandaloneContainers;
-import org.jboss.webbeans.CurrentManager;
 import org.jboss.webbeans.mock.MockEELifecycle;
 import org.jboss.webbeans.mock.MockServletLifecycle;
 import org.jboss.webbeans.mock.MockWebBeanDiscovery;
@@ -71,7 +70,6 @@ public void undeploy()
       lifecycle.endRequest();
       lifecycle.endSession();
       lifecycle.endApplication();
-      CurrentManager.setRootManager(null);
       lifecycle = null;
    }
 

diff --git a/...test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java b/...test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java
@@ -43,7 +43,6 @@ public void afterClass() throws Exception
       lifecycle.endRequest();
       lifecycle.endSession();
       lifecycle.endApplication();
-      CurrentManager.setRootManager(null);
       lifecycle = null;
    }