You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by zi...@apache.org on 2004/01/12 19:15:41 UTC
cvs commit: xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal ByNameRuntimeBindingType.java ByNameUnmarshaller.java
zieg 2004/01/12 10:15:40
Modified: v2/src/marshal/org/apache/xmlbeans/impl/marshal
ByNameRuntimeBindingType.java
ByNameUnmarshaller.java
Log:
fix bug involving overzealous search for xsi:type
DRT: passed
Revision Changes Path
1.18 +3 -0 xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal/ByNameRuntimeBindingType.java
Index: ByNameRuntimeBindingType.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal/ByNameRuntimeBindingType.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ByNameRuntimeBindingType.java 12 Jan 2004 09:07:15 -0000 1.17
+++ ByNameRuntimeBindingType.java 12 Jan 2004 18:15:40 -0000 1.18
@@ -385,6 +385,9 @@
public TypeUnmarshaller getTypeUnmarshaller(UnmarshallerImpl context)
{
+ //don't need any xsi stuff for attributes.
+ if (bindingProperty.isAttribute()) return unmarshaller;
+
final QName xsi_type = context.getXsiType();
if (xsi_type != null) {
1.9 +2 -1 xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal/ByNameUnmarshaller.java
Index: ByNameUnmarshaller.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal/ByNameUnmarshaller.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ByNameUnmarshaller.java 15 Dec 2003 05:03:30 -0000 1.8
+++ ByNameUnmarshaller.java 12 Jan 2004 18:15:40 -0000 1.9
@@ -79,7 +79,8 @@
public Object unmarshalAttribute(UnmarshallerImpl context)
{
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException("not an attribute: " +
+ type.getSchemaTypeName());
}
//TODO: cleanup this code. We are doing extra work for assertion checking
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org