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

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

Author: alesj
Date: 2009-11-04 10:34:20 -0500 (Wed, 04 Nov 2009)
New Revision: 96004

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/AbstractControllerStateModel.java
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/MapControllerStateModel.java
Log:
Small fixes.

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-11-04 15:33:22 UTC (rev 96003)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2009-11-04 15:34:20 UTC (rev 96004)
@@ -61,6 +61,7 @@
  *
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision$
  */
 public class AbstractController extends JBossObject implements Controller, GraphController, AbstractControllerMBean, AsynchronousController
@@ -68,7 +69,8 @@
    /** The lock */
    private ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 
-   /** The executor used to install ASYNCHRONOUS contexts. It must have a saturation policy of
+   /**
+    * The executor used to install ASYNCHRONOUS contexts. It must have a saturation policy of
     * (or semantically similar to) ThreadPoolExecutor.AbortPolicy or ThreadPoolExecutor.CallerRunsPolicy 
     */
    private Executor executor;
@@ -76,6 +78,7 @@
    /** Whether we are shutdown */
    private boolean shutdown = false;
 
+   /** The controller state model */
    private AbstractControllerStateModel stateModel = new MapControllerStateModel();
    
    /** All contexts by name Map<Object, ControllerContext> */
@@ -924,9 +927,9 @@
       ControllerState fromState = context.getState();
 
       Controller fromController = context.getController();
-      Set<ControllerContext> fromContexts = null;
+      Set<ControllerContext> fromContexts;
 
-      ControllerState toState = null;
+      ControllerState toState;
       if (ControllerState.ERROR.equals(fromState))
       {
          ControllerState initialState = stateModel.getInitialState();
@@ -2239,6 +2242,8 @@
       /**
        * Associate the current thread with the task, or clear it in contextsInstalledByExecutor
        * if it has been interrupted. This should be the first thing tasks do once they run.
+       *
+       * @param context the context
        * @return true if interrupted
        */
       synchronized boolean associateWithThreadOrDisassociateIfInterrupted(ControllerContext context)
@@ -2450,6 +2455,7 @@
        * This method must be called with the write lock taken
        * 
        * @param context The context to interrupt
+       * @param controller the controller
        */
       void interruptTaskAndBlock(ControllerContext context, AbstractController controller)
       {

Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerStateModel.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerStateModel.java	2009-11-04 15:33:22 UTC (rev 96003)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractControllerStateModel.java	2009-11-04 15:34:20 UTC (rev 96004)
@@ -25,7 +25,8 @@
 import org.jboss.dependency.spi.ControllerStateModel;
 
 /**
- * 
+ * Abstract controller state model.
+ *
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision: 1.1 $
  */
@@ -40,5 +41,4 @@
     * @throws IllegalArgumentException if the before state did not exist
     */
    public abstract boolean addState(ControllerState state, ControllerState before);
-
 }

Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/MapControllerStateModel.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/MapControllerStateModel.java	2009-11-04 15:33:22 UTC (rev 96003)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/MapControllerStateModel.java	2009-11-04 15:34:20 UTC (rev 96004)
@@ -50,7 +50,8 @@
     * 
     * @param state The state to add
     * @param before The state to add the new state before, or null to add the new state at the end
-    * @throws IllegalArgumentException if before is not null and does not exist 
+    * @return true if the state was added, false if the state already existed and therefore was not added
+    * @throws IllegalArgumentException if before is not null and does not exist
     */
    public synchronized boolean addState(ControllerState state, ControllerState before)
    {
@@ -58,9 +59,10 @@
          return false;
 
       //Work out the values for the new state and create it
-      ControllerStateWrapper previous = null;
-      ControllerStateWrapper next = null;
-      int index = 0;
+      ControllerStateWrapper previous;
+      ControllerStateWrapper next;
+      int index;
+
       if (before == null)
       {
          next = null;
@@ -73,9 +75,9 @@
           previous = next.getBefore();
           index = next.getIndex();
       }      
+
       ControllerStateWrapper newState = new ControllerStateWrapper(state, index, previous, next);
-      
-      
+
       //Add the state so that calls to isValid() can return successfully
       states.put(state, newState);
       stateList.add(index, state);
@@ -177,7 +179,6 @@
       return states.containsKey(state);
    }
 
-
    public ControllerState getInitialState()
    {
       ControllerStateWrapper result = first;