Fix for TUSCANY-2505

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

1 files changed, 11 insertions, 1 deletions

diff --git a/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
index 1e1a0c4e94..f779e04258 100644
--- a/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
+++ b/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
@@ -203,6 +203,11 @@ public class JAXWSJavaInterfaceProcessor implements JavaInterfaceVisitor {
                             QName qname = new QName(inputNS, inputName);
                             DataType dt = new DataTypeImpl<XMLType>(wrapperClass, new XMLType(qname, qname));
                             dataBindingExtensionPoint.introspectType(dt, operation);
+                            // TUSCANY-2505
+                            if (dt.getLogical() instanceof XMLType) {
+                                XMLType xmlType = (XMLType)dt.getLogical();
+                                xmlType.setElementName(qname);
+                            }
                             return dt;
                         } catch (ClassNotFoundException e) {
                             GeneratedClassLoader cl = new GeneratedClassLoader(clazz.getClassLoader());
@@ -235,9 +240,14 @@ public class JAXWSJavaInterfaceProcessor implements JavaInterfaceVisitor {
                         try {
                             Class<?> wrapperClass =
                                 Class.forName(outputWrapperClassName, false, clazz.getClassLoader());
-                            QName qname = new QName(inputNS, inputName);
+                            QName qname = new QName(outputNS, outputName);
                             DataType dt = new DataTypeImpl<XMLType>(wrapperClass, new XMLType(qname, qname));
                             dataBindingExtensionPoint.introspectType(dt, operation);
+                            // TUSCANY-2505
+                            if (dt.getLogical() instanceof XMLType) {
+                                XMLType xmlType = (XMLType)dt.getLogical();
+                                xmlType.setElementName(qname);
+                            }
                             return dt;
                         } catch (ClassNotFoundException e) {
                             GeneratedClassLoader cl = new GeneratedClassLoader(clazz.getClassLoader());