[jboss-cvs] JBossAS SVN: r60452 - trunk/ejb3/src/main/org/jboss/injection.

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

Author: bdecoste
Date: 2007-02-08 20:28:00 -0500 (Thu, 08 Feb 2007)
New Revision: 60452

Modified:
   trunk/ejb3/src/main/org/jboss/injection/DependsHandler.java
Log:
fix and test for @Depends and @EJB on same field or method

Modified: trunk/ejb3/src/main/org/jboss/injection/DependsHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/DependsHandler.java	2007-02-09 01:26:59 UTC (rev 60451)
+++ trunk/ejb3/src/main/org/jboss/injection/DependsHandler.java	2007-02-09 01:28:00 UTC (rev 60452)
@@ -63,7 +63,11 @@
          {
             throw new RuntimeException(e);
          }
-         injectors.put(method, new DependsMethodInjector(method, on));
+
+         // don't replace other injections
+         if (injectors.get(method) == null)
+            injectors.put(method, new DependsMethodInjector(method, on));
+
          container.getDependencyPolicy().addDependency(names[0]);
       }
    }
@@ -85,7 +89,11 @@
          {
             throw new RuntimeException(e);
          }
-         injectors.put(field, new DependsFieldInjector(field, on));
+
+         // don't replace other injections
+         if (injectors.get(field) == null)
+            injectors.put(field, new DependsFieldInjector(field, on));
+
          container.getDependencyPolicy().addDependency(names[0]);
       }
    }