[jboss-cvs] JBossAS SVN: r92795 - projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins.

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

Author: kabir.khan at jboss.com
Date: 2009-08-25 10:48:09 -0400 (Tue, 25 Aug 2009)
New Revision: 92795

Modified:
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
Log:
[JBKERNEL-53] Prevent endless loop on uninstaill of self dependencies

Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2009-08-25 14:24:23 UTC (rev 92794)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2009-08-25 14:48:09 UTC (rev 92795)
@@ -1369,10 +1369,14 @@
 
                               for (ControllerContext dependent : dependents)
                               {
-                                 contextsInstalledByExecutor.interruptTaskAndBlock(dependent, this);
-                                 if (isBeforeState(dependent.getState(), whenRequired) == false)
-                                 {  
-                                    uninstallContext(dependent, whenRequired, trace);
+                                 boolean selfDependency = (dependent == context);
+                                 if (!selfDependency)
+                                 {
+                                    contextsInstalledByExecutor.interruptTaskAndBlock(dependent, this);
+                                    if (isBeforeState(dependent.getState(), whenRequired) == false)
+                                    {  
+                                       uninstallContext(dependent, whenRequired, trace);
+                                    }
                                  }
                               }
                            }