From fa844ef795349943842118b8a26c948d99de7ee3 Mon Sep 17 00:00:00 2001 From: slaws Date: Tue, 13 Sep 2011 09:43:26 +0000 Subject: 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 --- .../java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sca-java-2.x/trunk/modules/databinding-jaxb') 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); -- cgit v1.2.3