[jboss-cvs] JBossAS SVN: r100804 - in projects/kernel/trunk/dependency/src: test/java/org/jboss/test/dependency/controller/benchmark and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2010-02-10 07:50:35 -0500 (Wed, 10 Feb 2010)
New Revision: 100804

Modified:
   projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
   projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/benchmark/AbstractSimpleBenchmark.java
Log:
[JBKERNEL-92] Make resolveContexts just check for a null state rather than if it is valid since we don't remove states

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-10 12:50:09 UTC (rev 100803)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2010-02-10 12:50:35 UTC (rev 100804)
@@ -1071,7 +1071,7 @@
          {
             ControllerState toState = stateModel.getNextState(fromState);
             
-            if (stateModel.isValidState(toState))
+            if (toState != null)
             {
                if (resolveContexts(fromState, toState, trace))
                {

Modified: projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/benchmark/AbstractSimpleBenchmark.java
===================================================================
--- projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/benchmark/AbstractSimpleBenchmark.java	2010-02-10 12:50:09 UTC (rev 100803)
+++ projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/benchmark/AbstractSimpleBenchmark.java	2010-02-10 12:50:35 UTC (rev 100804)
@@ -34,7 +34,7 @@
  */
 public abstract class AbstractSimpleBenchmark extends AbstractDependencyTest
 {
-   protected int iterations = 2000;
+   protected int iterations = 10000;
    
    public AbstractSimpleBenchmark(String name)
    {