[jboss-cvs] JBossAS SVN: r100738 - in projects/kernel/branches/resolver/dependency/src: test/java/org/jboss/test/dependency/controller/test and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2010-02-09 06:02:50 -0500 (Tue, 09 Feb 2010)
New Revision: 100738

Modified:
   projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/IndexingDependencyResolver.java
   projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/Benchmark.java
Log:
Attempt to avoid infinite loop when starting up AS (it does not work at the moment)


Modified: projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/IndexingDependencyResolver.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/IndexingDependencyResolver.java	2010-02-09 10:59:07 UTC (rev 100737)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/IndexingDependencyResolver.java	2010-02-09 11:02:50 UTC (rev 100738)
@@ -361,17 +361,18 @@
    @Override
    public void resolveWaitingContexts(boolean trace)
    {
+      int lastSize = 0;
       while (true)
       {
          Set<ControllerContext> contexts = null;
          contexts = getWaitingContextsChildControllers(contexts, trace);
          contexts = getEnabledOnDemandContexts(contexts, trace);
-         
-         if (contexts == null)
+
+         //Check if there are any new contexts to increment
+         if (contexts == null || contexts.size() == 0/* || contexts.size() == lastSize*/)
             return;
          
-         if (contexts.size() == 0)
-            return;
+         lastSize = contexts.size();
          
          for (ControllerContext context : contexts)
          {

Modified: projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/Benchmark.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/Benchmark.java	2010-02-09 10:59:07 UTC (rev 100737)
+++ projects/kernel/branches/resolver/dependency/src/test/java/org/jboss/test/dependency/controller/test/Benchmark.java	2010-02-09 11:02:50 UTC (rev 100738)
@@ -38,7 +38,7 @@
  */
 public class Benchmark extends AbstractDependencyTest
 {
-   int iterations = 30000;
+   int iterations = 10000;
    
    public Benchmark(String name)
    {