[jboss-cvs] JBossAS SVN: r95998 - projects/microcontainer/branches/Branch_2_0/dependency/src/main/java/org/jboss/dependency/plugins.

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

Author: alesj
Date: 2009-11-04 09:59:41 -0500 (Wed, 04 Nov 2009)
New Revision: 95998

Modified:
   projects/microcontainer/branches/Branch_2_0/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
Log:
Fix callback tracking cache.

Modified: projects/microcontainer/branches/Branch_2_0/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2009-11-04 14:52:55 UTC (rev 95997)
+++ projects/microcontainer/branches/Branch_2_0/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java	2009-11-04 14:59:41 UTC (rev 95998)
@@ -1410,7 +1410,7 @@
       {
          Map<Object, Set<CallbackItem<?>>> map = (isInstallPhase ? installCallbacks : uninstallCallbacks);
          Set<CallbackItem<?>> callbacks = map.get(name);
-         return callbacks != null ? callbacks : new HashSet<CallbackItem<?>>();
+         return callbacks != null ? callbacks : Collections.<CallbackItem<?>>emptySet();
       }
       finally
       {
@@ -1483,7 +1483,8 @@
          if (dependencyInfo != null && dependencyInfo.isAutowireCandidate())
          {
             // match callbacks by name
-            Set<CallbackItem<?>> existingCallbacks = getCallbacks(context.getName(), isInstallPhase);
+            Set<CallbackItem<?>> existingCallbacks = new HashSet<CallbackItem<?>>(); 
+            existingCallbacks.addAll(getCallbacks(context.getName(), isInstallPhase));
             // match by classes
             Collection<Class<?>> classes = getClassesImplemented(context.getTarget());
             if (classes != null && classes.isEmpty() == false)