Author: mukulg
Date: Wed Mar 20 10:42:46 2013
New Revision: 1458744
URL: http://svn.apache.org/r1458744
Log:
committing fix for jira issue XERCESJ-1610
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java?rev=1458744&r1=1458743&r2=1458744&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
Wed Mar 20 10:42:46 2013
@@ -1447,8 +1447,9 @@ class XSDComplexTypeTraverser extends X
// invoke the method recursively (traverse up the type hierarchy)
XSTypeDefinition ancestorType = baseSchemaType.getBaseType();
- if (ancestorType != null &&
!(ancestorType.getName().equals(SchemaSymbols.ATTVAL_ANYTYPE) ||
-
ancestorType.derivedFrom(Constants.NS_XMLSCHEMA,
SchemaSymbols.ATTVAL_ANYATOMICTYPE, XSConstants.DERIVATION_RESTRICTION))) {
+
+ if (ancestorType != null &&
!((XS11TypeHelper.getSchemaTypeName(ancestorType)).equals(SchemaSymbols.ATTVAL_ANYTYPE)
||
+
ancestorType.derivedFrom(Constants.NS_XMLSCHEMA,
SchemaSymbols.ATTVAL_ANYATOMICTYPE, XSConstants.DERIVATION_RESTRICTION))) {
addAssertsFromBaseTypes(ancestorType);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org
For additional commands, e-mail: commits-h...@xerces.apache.org
