TUSCANY-3937 - Don't overwrite the default XMLType otherwise everything else that has the default type gets to know about it.

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

1 files changed, 3 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 9088066443..1eb78caeb1 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
@@ -94,8 +94,10 @@ public class JAXBDataBinding extends BaseDataBinding {
         }
         
         // If DataType is already an XMLType it might have an element name that we wish to preserve
+        // but check that we're not overwriting the UNKNOWN type
         Object logical = dataType.getLogical();
-        if (logical instanceof XMLType) {
+        if (logical instanceof XMLType &&
+            logical != XMLType.UNKNOWN) {
             ((XMLType)logical).setTypeName(xmlType.getTypeName());
         } else {
             dataType.setLogical(xmlType);