[jboss-cvs] JBossAS SVN: r92786 - projects/microcontainer/branches/Branch_2_0/dependency/src/main/java/org/jboss/dependency/plugins.

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

Author: thomas.diesler at jboss.com
Date: 2009-08-25 07:22:09 -0400 (Tue, 25 Aug 2009)
New Revision: 92786

Modified:
   projects/microcontainer/branches/Branch_2_0/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
Log:
[JBCL-24] Circular and self dependencies
Prevent endless loop on unstill of self dependencies

Modified: projects/microcontainer/branches/Branch_2_0/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2009-08-25 09:45:44 UTC (rev 92785)
+++ projects/microcontainer/branches/Branch_2_0/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2009-08-25 11:22:09 UTC (rev 92786)
@@ -1231,7 +1231,8 @@
 
                               for (ControllerContext dependent : dependents)
                               {
-                                 if (isBeforeState(dependent.getState(), whenRequired) == false)
+                                 boolean selfDependency = (dependent == context);
+                                 if (selfDependency == false && isBeforeState(dependent.getState(), whenRequired) == false)
                                     uninstallContext(dependent, whenRequired, trace);
                               }
                            }