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

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

Author: alesj
Date: 2009-07-31 11:01:29 -0400 (Fri, 31 Jul 2009)
New Revision: 91878

Modified:
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
Log:
Move on-demand uninstall to non-finally.

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-07-31 14:45:41 UTC (rev 91877)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2009-07-31 15:01:29 UTC (rev 91878)
@@ -1420,6 +1420,8 @@
          Set<ControllerContext> toContexts = toController.getContextsByState(toState);
          toContexts.add(context);
          context.setState(toState);
+
+         //uninstallUnusedOnDemandContexts(context, trace);
       }
       catch (Throwable t)
       {
@@ -1428,12 +1430,14 @@
       finally
       {
          lockWrite();
-//         uninstallUnusedOnDemandContexts(context, trace);
       }
    }
 
    /**
-    * 
+    * Uninstall On_Demand contexts that are not used anymore.
+    *
+    * @param context the context which is being uninstalled.
+    * @param trace do trace log
     */
    protected void uninstallUnusedOnDemandContexts(ControllerContext context, boolean trace)
    {
@@ -1848,7 +1852,8 @@
                synchronized (this)
                {
                   if (installStats == null)
-                     installStats = new StateStatistics();;
+                     installStats = new StateStatistics();
+
                   String state = toState.getStateString();
                   String name = context.getName().toString();
                   installStats.addStatistic(state, name, time);