[jboss-cvs] JBossAS SVN: r97460 - projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2009-12-04 09:29:59 -0500 (Fri, 04 Dec 2009)
New Revision: 97460

Modified:
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java
Log:
Make sure that all beans are undeployed

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java	2009-12-04 13:43:11 UTC (rev 97459)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java	2009-12-04 14:29:59 UTC (rev 97460)
@@ -350,17 +350,30 @@
       threadPoolExecutor.shutdown();
 
       // Shutdown all deployments
-      List<Deployment> shutdownDeployments = new LinkedList<Deployment>(deployments);
-      Collections.reverse(shutdownDeployments);
+      if (deployments.size() > 0)
+      {
+         List<Deployment> shutdownDeployments = new LinkedList<Deployment>(deployments);
+         Collections.reverse(shutdownDeployments);
 
-      for (Deployment deployment : shutdownDeployments)
-      {
-         shutdownDeployment(deployment);
+         for (Deployment deployment : shutdownDeployments)
+         {
+            shutdownDeployment(deployment);
+         }
       }
 
       // Remove kernel bean
       removeBean("Kernel");
 
+      // Check for additional beans
+      if (beans.size() > 0)
+      {
+         List<String> beanNames = new LinkedList<String>(beans.keySet());
+         for (String beanName : beanNames)
+         {
+            removeBean(beanName);
+         }
+      }
+
       // Release MBeanServer
       MBeanServerFactory.releaseMBeanServer(mbeanServer);