[jboss-cvs] JBossAS SVN: r75591 - projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins.

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

Author: adrian at jboss.org
Date: 2008-07-10 05:41:53 -0400 (Thu, 10 Jul 2008)
New Revision: 75591

Modified:
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
Log:
[JBMICROCONT-313] - If resolveDependencies throws an unchecked exception, move the context to the error state

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java	2008-07-10 09:04:39 UTC (rev 75590)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java	2008-07-10 09:41:53 UTC (rev 75591)
@@ -1017,8 +1017,18 @@
             if (advance(ctx))
             {
                DependencyInfo dependencies = ctx.getDependencyInfo();
-               if (dependencies.resolveDependencies(this, state))
-                  result.add(ctx);
+               try
+               {
+                  if (dependencies.resolveDependencies(this, state))
+                     result.add(ctx);
+               }
+               catch (Throwable error)
+               {
+                  log.error("Error resolving dependencies for " + state.getStateString() + ": " + ctx.toShortString(), error);
+                  uninstallContext(ctx, ControllerState.NOT_INSTALLED, trace);
+                  errorContexts.put(ctx.getName(), ctx);
+                  ctx.setError(error);
+               }
             }
          }
       }