[jboss-cvs] JBossAS SVN: r62475 - in projects/microcontainer/trunk/kernel/src: tests/org/jboss/test/kernel/inject/test and 1 other directory.

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

Author: alesj
Date: 2007-04-21 17:27:21 -0400 (Sat, 21 Apr 2007)
New Revision: 62475

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/CardinalityCallbackTestCase.java
Log:
Callback / Install item impl; small fix.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java	2007-04-21 21:20:20 UTC (rev 62474)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java	2007-04-21 21:27:21 UTC (rev 62475)
@@ -243,7 +243,8 @@
       lockRead();
       try
       {
-         return Collections.unmodifiableSet(getContexts(clazz));
+         Set<KernelControllerContext> contexts = getContexts(clazz);
+         return contexts != null && contexts.isEmpty() == false ? Collections.unmodifiableSet(contexts) : null;
       }
       finally
       {

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/CardinalityCallbackTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/CardinalityCallbackTestCase.java	2007-04-21 21:20:20 UTC (rev 62474)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/CardinalityCallbackTestCase.java	2007-04-21 21:27:21 UTC (rev 62475)
@@ -76,6 +76,13 @@
 
       assertNotNull(injectee.getTesterInterfaces());
       assertEquals(3, injectee.getTesterInterfaces().size());
+
+      change(tester3, ControllerState.NOT_INSTALLED);
+      assertEquals(2, injectee.getTesterInterfaces().size());
+      assertEquals(context.getState(), ControllerState.INSTALLED);
+
+      change(tester2, ControllerState.NOT_INSTALLED);
+      assertEquals(context.getState(), ControllerState.CONFIGURED);
    }
 
 }