[jboss-cvs] JBossAS SVN: r57264 - projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi

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

Author: adrian at jboss.org
Date: 2006-09-28 10:11:34 -0400 (Thu, 28 Sep 2006)
New Revision: 57264

Modified:
   projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/IncompleteDeploymentException.java
Log:
Populate the missing dependency state first such that the *ERROR* 
state doesn't overwrite the real error.

Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/IncompleteDeploymentException.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/IncompleteDeploymentException.java	2006-09-28 13:33:25 UTC (rev 57263)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/IncompleteDeploymentException.java	2006-09-28 14:11:34 UTC (rev 57264)
@@ -98,6 +98,17 @@
       // Popluate the potential root causes
       Map<String, String> rootCauses = new HashMap<String, String>();
 
+      // Missing dependencies are root causes
+      Map<String, Set<MissingDependency>> contextsMissingDependencies = incompleteDeployments.getContextsMissingDependencies();
+      if (contextsMissingDependencies.isEmpty() == false)
+      {
+         for (Map.Entry<String, Set<MissingDependency>> entry : contextsMissingDependencies.entrySet())
+         {
+            for (MissingDependency dependency : entry.getValue())
+               rootCauses.put(dependency.getDependency(), dependency.getActualState());
+         }
+      }
+
       // Errors are root causes
       Map<String, Throwable> contextsInError = incompleteDeployments.getContextsInError();
       if (contextsInError.isEmpty() == false)
@@ -111,16 +122,6 @@
                rootCauses.put(entry.getKey(), t.toString());
          }
       }
-      // Missing dependencies are root causes
-      Map<String, Set<MissingDependency>> contextsMissingDependencies = incompleteDeployments.getContextsMissingDependencies();
-      if (contextsMissingDependencies.isEmpty() == false)
-      {
-         for (Map.Entry<String, Set<MissingDependency>> entry : contextsMissingDependencies.entrySet())
-         {
-            for (MissingDependency dependency : entry.getValue())
-               rootCauses.put(dependency.getDependency(), dependency.getActualState());
-         }
-      }
 
       // Display all the missing dependencies
       if (contextsMissingDependencies.isEmpty() == false)