You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2010/04/15 16:54:16 UTC
svn commit: r934433 -
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
Author: knoaman
Date: Thu Apr 15 14:54:16 2010
New Revision: 934433
URL: http://svn.apache.org/viewvc?rev=934433&view=rev
Log:
Check for assert elements only if we are dealing with XML Schema 1.1
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=934433&r1=934432&r2=934433&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 Thu Apr 15 14:54:16 2010
@@ -775,7 +775,7 @@ class XSDComplexTypeTraverser extends X
traverseAsserts(node, schemaDoc, grammar,
fComplexTypeDecl);
} else {
- // a non assert element after attributes is an error
+ // either XML Schema 1.0 or a non assert element
fAttrChecker.returnAttrArray(simpleContentAttrValues, schemaDoc);
fAttrChecker.returnAttrArray(derivationTypeAttrValues, schemaDoc);
throw new ComplexTypeRecoverableError(
@@ -1615,8 +1615,7 @@ class XSDComplexTypeTraverser extends X
}
private boolean isAssert(Element e) {
- String elementName = DOMUtil.getLocalName(e);
- return elementName.equals(SchemaSymbols.ELT_ASSERT);
+ return (fSchemaHandler.fSchemaVersion == Constants.SCHEMA_VERSION_1_1 && DOMUtil.getLocalName(e).equals(SchemaSymbols.ELT_ASSERT));
}
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org