Create an SCA Reference from EJB reference only if there is no @Reference annotation on that field or method.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@834442 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 0 deletions

diff --git a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
index bd0e026adf..505578d6f1 100644
--- a/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
+++ b/branches/sca-java-1.x/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
@@ -147,6 +147,10 @@ public class JavaEEOptionalExtensionImpl implements JavaEEOptionalExtension {
         // Process Remote EJB References
         for(Map.Entry<String, EjbReferenceInfo> entry : ejbInfo.ejbReferences.entrySet()) {
             EjbReferenceInfo ejbRef = entry.getValue();
+            // If the EJB reference has @Reference SCA annotation, then skip that reference
+            if(!hasReferenceAnnotation(ejbRef.injectionTarget)) {
+                continue;
+            }
             String referenceName = entry.getKey();
             referenceName = referenceName.replace("/", "_");
             Reference reference = assemblyFactory.createComponentReference();