[jboss-cvs] JBossAS SVN: r100425 - in projects/kernel/branches/resolver: kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2010-02-04 11:33:46 -0500 (Thu, 04 Feb 2010)
New Revision: 100425

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/NameDependencyResolverMatcher.java
   projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/ClassDependencyResolverMatcher.java
   projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/SupplyDemandDependencyResolverMatcher.java
Log:
Get rid of System.out.printlns and fix recursion bug where enabled ondemand context is the same as the installing context

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-04 16:29:46 UTC (rev 100424)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/IndexingDependencyResolver.java	2010-02-04 16:33:46 UTC (rev 100425)
@@ -155,7 +155,6 @@
    @Override
    public void registerDependency(ControllerContext context, DependencyItem item)
    {
-      System.out.println("-------> Register dependency " + item + " in " + getController());
       DependencyResolverMatcher matcher = getMatcherForDependencyItem(item);
       matcher.registerDependency(context, item.getClass().cast(item));
       
@@ -165,7 +164,6 @@
    @Override
    public void unregisterDependency(ControllerContext context, DependencyItem item)
    {
-      System.out.println("-------> Unregister dependency " + item + " in " + getController());
       DependencyResolverMatcher matcher = getMatcherForDependencyItem(item);
       matcher.unregisterDependency(context, item);
       flushJBossObjectCache();
@@ -223,7 +221,8 @@
          for (ControllerContext enabled : enabledOnDemandContexts)
          {
             enabledOnDemandContexts.remove(enabled);
-            resolveContexts(enabled, trace);
+            if (enabled != context)
+               resolveContexts(enabled, trace);
          }
       }
    }

Modified: projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/NameDependencyResolverMatcher.java
===================================================================
--- projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/NameDependencyResolverMatcher.java	2010-02-04 16:29:46 UTC (rev 100424)
+++ projects/kernel/branches/resolver/dependency/src/main/java/org/jboss/dependency/plugins/resolver/indexing/NameDependencyResolverMatcher.java	2010-02-04 16:33:46 UTC (rev 100425)
@@ -216,7 +216,6 @@
          }
          contexts.add(owner);
    
-         System.out.println("---------> Registered " + getDependentState(item) + "->" + name + "->" + owner);
          flushJBossObjectCache();
       }
       finally

Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/ClassDependencyResolverMatcher.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/ClassDependencyResolverMatcher.java	2010-02-04 16:29:46 UTC (rev 100424)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/ClassDependencyResolverMatcher.java	2010-02-04 16:33:46 UTC (rev 100425)
@@ -22,7 +22,6 @@
 package org.jboss.kernel.plugins.resolver.indexing;
 
 import org.jboss.dependency.spi.DependencyItem;
-import org.jboss.kernel.plugins.dependency.CallbackDependencyItem;
 import org.jboss.kernel.plugins.dependency.ClassDependencyItem;
 
 /**

Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/SupplyDemandDependencyResolverMatcher.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/SupplyDemandDependencyResolverMatcher.java	2010-02-04 16:29:46 UTC (rev 100424)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/SupplyDemandDependencyResolverMatcher.java	2010-02-04 16:33:46 UTC (rev 100425)
@@ -50,6 +50,9 @@
       if (context instanceof KernelControllerContext == false)
          return null;
       
+      if (((KernelControllerContext)context).getBeanMetaData().getSupplies() == null)
+         return null;
+      
       lockRead();
       try
       {