[jboss-cvs] JBossAS SVN: r96093 - projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel.

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

Author: alesj
Date: 2009-11-06 06:35:40 -0500 (Fri, 06 Nov 2009)
New Revision: 96093

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
Log:
Minimize code.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java	2009-11-06 11:31:23 UTC (rev 96092)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java	2009-11-06 11:35:40 UTC (rev 96093)
@@ -64,7 +64,7 @@
    
    private ReadWriteLock lock = new ReentrantReadWriteLock();
 
-   /** Records which KernelContextCreator was used to deploy a context */
+   /** Records which KernelControllerContextCreator was used to deploy a context */
    private Map<String, KernelControllerContextCreator> deployedWithControllerContextCreator = new ConcurrentHashMap<String, KernelControllerContextCreator>();
 
    /**
@@ -188,6 +188,7 @@
     * Creates a kernel controller context using the controller context creators in controllerContextCreators.
     * The first controller context creator that returns a context is used. If no matching controller context
     * creator is found, a plain KernelControllerContext is created.
+    *
     * @param unit The deployment unit
     * @param deployment The bean metadata being deployed
     * @return the created KernelControllerContext
@@ -221,13 +222,8 @@
    public void undeploy(DeploymentUnit unit, BeanMetaData deployment)
    {
       KernelControllerContextCreator creator = deployedWithControllerContextCreator.remove(deployment.getName());
-      boolean uninstalled = false;
-      if (creator != null)
+      if (creator == null || creator.uninstallContext(controller, unit, deployment) == false)
       {
-         uninstalled = creator.uninstallContext(controller, unit, deployment);
-      }
-      if (!uninstalled)
-      {
          controller.uninstall(deployment.getName());
       }