tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelvingood...@apache.org
Subject svn commit: r451176 - in /incubator/tuscany/branches/sdo-java-M2: distribution/sdo/CHANGES.txt sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
Date Fri, 29 Sep 2006 08:53:28 GMT
Author: kelvingoodson
Date: Fri Sep 29 01:53:27 2006
New Revision: 451176

URL: http://svn.apache.org/viewvc?view=rev&rev=451176
Log:
TUSCANY-755 copy fix from trunk to M2 branch and record bug fix in release doc

Modified:
    incubator/tuscany/branches/sdo-java-M2/distribution/sdo/CHANGES.txt
    incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java

Modified: incubator/tuscany/branches/sdo-java-M2/distribution/sdo/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-java-M2/distribution/sdo/CHANGES.txt?view=diff&rev=451176&r1=451175&r2=451176
==============================================================================
--- incubator/tuscany/branches/sdo-java-M2/distribution/sdo/CHANGES.txt (original)
+++ incubator/tuscany/branches/sdo-java-M2/distribution/sdo/CHANGES.txt Fri Sep 29 01:53:27
2006
@@ -1,4 +1,4 @@
-M2
+M2
 (from M1)
 
 
@@ -67,4 +67,5 @@
     * made Type.getProperty(String) implementaion thread safe (TUSCANY-682)
     * support base64Binary and hexBinary XSD types correctly (TUSCANY-685)
     * fixed generation of invalid prefixes in XML serialization (TUSCANY-711)
-    * sometimes SDOXMLResourceImpl (instead of XSDResourceImp) was incorrectly used when
loading .xsd files (TUSCANY-714)
\ No newline at end of file
+    * sometimes SDOXMLResourceImpl (instead of XSDResourceImp) was incorrectly used when
loading .xsd files (TUSCANY-714)
+    * roundtripping an xsd:anyType via XML using XMLStreamHelper gave wrong kind of DataObject
(TUSCANY-755)
\ No newline at end of file

Modified: incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java?view=diff&rev=451176&r1=451175&r2=451176
==============================================================================
--- incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
(original)
+++ incubator/tuscany/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
Fri Sep 29 01:53:27 2006
@@ -241,7 +241,7 @@
         Type type = dataObject.getType();
         if (rootElement != null) {
             Type modelType = rootElement.getType();
-            if (type.getBaseTypes().contains(modelType)) {
+            if (type != modelType) {
                 QName realTypeName = namespaceContext.createQName(type.getURI(), xsdHelper.getLocalName(type));
                 String typeName = realTypeName.getPrefix() + ":" + realTypeName.getLocalPart();
                 NameValuePair pair = new NameValuePair(XSI_TYPE_QNAME, typeName);



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message