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

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

Author: alesj
Date: 2007-04-27 08:08:20 -0400 (Fri, 27 Apr 2007)
New Revision: 62609

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCallbackItem.java
Log:
Remove context hook.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCallbackItem.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCallbackItem.java	2007-04-27 11:44:45 UTC (rev 62608)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/CollectionCallbackItem.java	2007-04-27 12:08:20 UTC (rev 62609)
@@ -118,9 +118,23 @@
    {
       T holder = fillHolder(controller);
       if (isInstallPhase == false)
-         holder.remove(context.getTarget());
+         removeUninstallingContext(holder, context);
       execute(holder);
       addDependency(controller, context, isInstallPhase);
    }
 
+   /**
+    * Remove the uninstalling context from holder.
+    * Since the context is about to change state -
+    * not part of callback watched targets.
+    * 
+    * Can be overridden for different remove behaviour.
+    *
+    * @param holder collection holder
+    * @param context current context
+    */
+   protected void removeUninstallingContext(T holder, ControllerContext context)
+   {
+      holder.remove(context.getTarget());
+   }
 }