[jboss-cvs] JBossAS SVN: r63709 - in projects/microcontainer/trunk: container/src/main/org/jboss/metadata/plugins/loader/memory and 1 other directories.

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

Author: alesj
Date: 2007-06-28 08:37:35 -0400 (Thu, 28 Jun 2007)
New Revision: 63709

Modified:
   projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/ClassLoaderDomain.java
   projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java
   projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployersImpl.java
Log:
Code analyze, simple fix to DeployersImpl.

Modified: projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/ClassLoaderDomain.java
===================================================================
--- projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/ClassLoaderDomain.java	2007-06-28 11:41:25 UTC (rev 63708)
+++ projects/microcontainer/trunk/classloader/src/main/org/jboss/classloader/spi/ClassLoaderDomain.java	2007-06-28 12:37:35 UTC (rev 63709)
@@ -269,9 +269,7 @@
       if (trace)
          log.trace(this + " get resource from parent " + name + " parent=" + parentLoader);
       
-      URL result = null;
-      if (parentLoader != null)
-         result = parentLoader.getResource(name, resourceName);
+      URL result = parentLoader.getResource(name, resourceName);
 
       if (trace)
       {
@@ -337,8 +335,7 @@
       if (trace)
          log.trace(this + " get resources from parent " + name + " parent=" + parentLoader);
       
-      if (parentLoader != null)
-         parentLoader.getResources(name, resourceName, urls);
+      parentLoader.getResources(name, resourceName, urls);
    }
 
    /**

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java	2007-06-28 11:41:25 UTC (rev 63708)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java	2007-06-28 12:37:35 UTC (rev 63709)
@@ -202,8 +202,7 @@
       Map<String, BasicAnnotationItem> temp1 = annotations;
       if (temp1 != null && temp1.size() > 0)
       {
-         if (all == null)
-            all = new ArrayList<BasicMetaDataItem>();
+         all = new ArrayList<BasicMetaDataItem>();
          Collection<BasicAnnotationItem> values = temp1.values();
          all.addAll(values);
       }

Modified: projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployersImpl.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployersImpl.java	2007-06-28 11:41:25 UTC (rev 63708)
+++ projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/deployers/DeployersImpl.java	2007-06-28 12:37:35 UTC (rev 63709)
@@ -567,8 +567,8 @@
          deploymentsInError = Collections.singletonMap(context.getName(), problem);
       
       if (context.isDeployed() == false)
-         deploymentsMissingDeployer.add(context.getName());
-      
+         deploymentsMissingDeployer = Collections.singleton(context.getName());
+
       // TODO go through controller contexts for the deployment + related contexts
       
       IncompleteDeployments incomplete = new IncompleteDeployments(deploymentsInError, deploymentsMissingDeployer, contextsInError, contextsMissingDependencies);
@@ -648,10 +648,6 @@
     */
    protected void doInstall(Deployer deployer, DeploymentContext context, boolean doComponents) throws Throwable
    {
-      // Take a copy of the components so we don't start looping on newly added components
-      // in the component deployers
-      List<DeploymentContext> components = new ArrayList<DeploymentContext>(context.getComponents());
-
       DeploymentUnit unit = context.getDeploymentUnit();
       if (isRelevant(deployer, unit, context.isTopLevel(), context.isComponent()))
          deployer.deploy(unit);
@@ -660,9 +656,13 @@
 
       if (doComponents)
       {
-         try
+         List<DeploymentContext> currentComponents = context.getComponents();
+         if (currentComponents != null && currentComponents.isEmpty() == false)
          {
-            if (components != null && components.isEmpty() == false)
+            // Take a copy of the components so we don't start looping on newly added components
+            // in the component deployers
+            List<DeploymentContext> components = new ArrayList<DeploymentContext>(currentComponents);
+            try
             {
                for (int i = 0; i < components.size(); ++i)
                {
@@ -674,7 +674,7 @@
                   catch (DeploymentException e)
                   {
                      // Unwind the previous components
-                     for (int j = i-1; j >=0; --j)
+                     for (int j = i - 1; j >= 0; --j)
                      {
                         component = components.get(j);
                         doUninstall(deployer, component, true);
@@ -683,12 +683,12 @@
                   }
                }
             }
+            catch (DeploymentException e)
+            {
+               doUninstall(deployer, context, false);
+               throw e;
+            }
          }
-         catch (DeploymentException e)
-         {
-            doUninstall(deployer, context, false);
-            throw e;
-         }
       }
    }
    
@@ -788,7 +788,7 @@
       if (deployer.isComponentsOnly() && isComponent == false)
          return false;
 
-      // Deployer doesn't wantwants components
+      // Deployer doesn't wants components
       if (deployer.isWantComponents() == false && isComponent)
          return false;