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

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

Author: alesj
Date: 2010-02-09 11:48:19 -0500 (Tue, 09 Feb 2010)
New Revision: 100762

Modified:
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
Log:
[JBKERNEL-93]; read iDependOn before DI::unresolve

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	2010-02-09 16:22:40 UTC (rev 100761)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2010-02-09 16:48:19 UTC (rev 100762)
@@ -1469,28 +1469,30 @@
                }
             }
 
-            Set<DependencyItem> iDependOn = dependencies.getIDependOn(null);
-            if (iDependOn.isEmpty() == false)
+            Set<DependencyItem> iDependOns = dependencies.getIDependOn(null);
+            if (iDependOns.isEmpty() == false)
             {
-               for (DependencyItem item : iDependOn)
+               for (DependencyItem item : iDependOns)
                {
                   if (item.isResolved()) 
                   {
                      ControllerState whenRequired = item.getWhenRequired();
                      if (whenRequired == null || whenRequired.equals(fromState))
                      {
+                        // get iDependOn before we clear it in unresolve
+                        Object iDependOn = item.getIDependOn();
                         if (item.unresolved(this))
                         {
                            try
                            {
                               //FIXME DemandDependencyItems have a null iDependOn
-                              if (item.getIDependOn() == null)
+                              if (iDependOn == null)
                               {
                                  log.debug("Null iDependOn for " + item);
                               }
                               else
                               {
-                                 ControllerContext dependency = getContext(item.getIDependOn(), item.getDependentState());
+                                 ControllerContext dependency = getContext(iDependOn, item.getDependentState());
                                  if (dependency != null)
                                  {
                                     DependencyInfo info = dependency.getDependencyInfo();