Author: knoaman
Date: Fri Dec 11 15:26:14 2009
New Revision: 889652
URL: http://svn.apache.org/viewvc?rev=889652&view=rev
Log:
Fix for CTA - We were always falling back to the element declaration's type,
even if the type alternative was validly derived from the type of the element.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java?rev=889652&r1=889651&r2=889652&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java
Fri Dec 11 15:26:14 2009
@@ -169,9 +169,9 @@
"e-props-correct.7",
new Object[] { element.getName(),
alternativeType.getName(), element.fType.getName()},
altElement);
+ // fall back to element declaration's type
+ alternativeType = element.fType;
}
- // fall back to element declaration's type
- alternativeType = element.fType;
}
// not expecting any more children
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
