Fix bare+JAXB wsdlgen case. Fix Holder+void_return_type case.

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

1 files changed, 9 insertions, 1 deletions

diff --git a/sca-java-2.x/trunk/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java b/sca-java-2.x/trunk/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
index 4d3302cffa..9088066443 100644
--- a/sca-java-2.x/trunk/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
+++ b/sca-java-2.x/trunk/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
@@ -92,7 +92,15 @@ public class JAXBDataBinding extends BaseDataBinding {
         if (xmlType == null) {
             return false;
         }
-        dataType.setLogical(xmlType);
+        
+        // If DataType is already an XMLType it might have an element name that we wish to preserve
+        Object logical = dataType.getLogical();
+        if (logical instanceof XMLType) {
+            ((XMLType)logical).setTypeName(xmlType.getTypeName());
+        } else {
+            dataType.setLogical(xmlType);            
+        }
+
         dataType.setDataBinding(NAME);
         return true;
     }