[jboss-cvs] JBossAS SVN: r99776 - projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing.

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

Author: kabir.khan at jboss.com
Date: 2010-01-21 15:23:48 -0500 (Thu, 21 Jan 2010)
New Revision: 99776

Modified:
   projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/ContextualInjectionDependencyResolverMatcher.java
   projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/SupplyDemandDependencyResolverMatcher.java
Log:
Simple fixes

Modified: projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/ContextualInjectionDependencyResolverMatcher.java
===================================================================
--- projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/ContextualInjectionDependencyResolverMatcher.java	2010-01-21 20:23:48 UTC (rev 99775)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/ContextualInjectionDependencyResolverMatcher.java	2010-01-21 20:23:48 UTC (rev 99776)
@@ -125,7 +125,7 @@
 
       Object dependency = item.getIDependOn();
       if (dependency instanceof QualifierKey == false)
-         throw new IllegalStateException("Dependency is not a QualifierKey '" + dependency + "' in " + item);
+         throw new IllegalStateException("Dependency is not a QualifierKey or a class: '" + dependency + "' in " + item);
       Class<?> clazz = ((QualifierKey)dependency).getType();
 
       ConcurrentMap<Class<?>, List<ControllerContext>> contextsByClass = contextsByState.get(getDependentState(item));

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-01-21 20:23:48 UTC (rev 99775)
+++ projects/kernel/branches/resolver/kernel/src/main/java/org/jboss/kernel/plugins/resolver/indexing/SupplyDemandDependencyResolverMatcher.java	2010-01-21 20:23:48 UTC (rev 99776)
@@ -75,7 +75,7 @@
    {
       Object name = item.getIDependOn();
 
-      List<ControllerContext> contexts = contextsByState.get(name);
+      List<ControllerContext> contexts = contextsByState.get(getDependentState(item));
       if (contexts == null)
          throw new IllegalStateException("Inconsistent state");
       if (!contexts.remove(owner))