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

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

Author: kabir.khan at jboss.com
Date: 2007-06-05 05:35:32 -0400 (Tue, 05 Jun 2007)
New Revision: 63342

Modified:
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
Log:
Get rid of some redundant code

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	2007-06-05 09:26:19 UTC (rev 63341)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java	2007-06-05 09:35:32 UTC (rev 63342)
@@ -1044,7 +1044,6 @@
 
    protected void handleLifecycleCallbacks(ControllerContext context, ControllerState state, boolean install) throws Throwable
    {
-      List<LifecycleCallbackItem> installedCallbacks = null;
       DependencyInfo di = context.getDependencyInfo();
       List<LifecycleCallbackItem> callbacks = di.getLifecycleCallbacks();
       for (LifecycleCallbackItem callback : callbacks)
@@ -1052,25 +1051,9 @@
          if (callback.getWhenRequired().equals(state))
          {
             if (install)
-            {
-               try
-               {
-                  callback.install(context);
-                  if (installedCallbacks == null)
-                  {
-                     installedCallbacks = new ArrayList<LifecycleCallbackItem>();
-                  }
-                  installedCallbacks.add(callback);
-               }
-               catch(Throwable t)
-               {
-                  throw t;
-               }
-            }
+               callback.install(context);
             else
-            {
                callback.uninstall(context);
-            }
          }
       }
    }