TUSCANY-3625 - Ensure that the Java version of the method name is used to avert the case that the Tuscany interface has a different operation name by virtue of JAXWS annotations. Thanks for the patch Scott.

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

2 files changed, 22 insertions, 1 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java b/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
index 999a3fcfd4..323fa76006 100644
--- a/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
@@ -22,6 +22,7 @@ import org.apache.tuscany.sca.binding.ejb.EJBBinding;
 import org.apache.tuscany.sca.binding.ejb.util.EJBHandler;
 import org.apache.tuscany.sca.binding.ejb.util.NamingEndpoint;
 import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
 import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 
@@ -71,7 +72,22 @@ public class EJBBindingInvoker implements Invoker {
         // lookup home and ejb stub
         EJBHandler ejbHandler = new EJBHandler(endpoint, serviceInterface);
 
-        String methodName = operation.getName();
+        //
+        // If we really couldn't have anything but a JavaOperation maybe we should
+        // remove the if-block.  Assuming we had some other type of operation, if
+        // that is possible, we might still need to map to a Java operation name,
+        // (for example because the WSDL operation name might be set using a JSR-181
+        // annotation to something other than the Java operation name.
+        //
+        // But for now we'll keep the else-block in here.
+        //
+        String methodName = null;
+        if (operation instanceof JavaOperation) {
+            JavaOperation javaOp = (JavaOperation) operation;
+            methodName = javaOp.getJavaMethod().getName();
+        } else {
+            methodName = operation.getName();
+        }
 
         // invoke business method on ejb
         Object response = ejbHandler.invoke(methodName, (Object[])payload);
diff --git a/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java b/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
index 7cefba530a..2e79080d52 100644
--- a/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
+++ b/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
@@ -19,9 +19,14 @@
 
 package calculator;
 
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
 /**
  * @version $Rev$ $Date$
  */
+@WebService
 public interface AddService {
+    @WebMethod(operationName = "Add")
     double add(double n1, double n2);
 }