Author: mukulg
Date: Tue Feb 16 11:27:11 2021
New Revision: 1886585
URL: http://svn.apache.org/viewvc?rev=1886585&view=rev
Log:
committing fix for jira issue XERCESJ-1727
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDSimpleTypeTraverser.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDSimpleTypeTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDSimpleTypeTraverser.java?rev=1886585&r1=1886584&r2=1886585&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDSimpleTypeTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDSimpleTypeTraverser.java
Tue Feb 16 11:27:11 2021
@@ -456,7 +456,12 @@ class XSDSimpleTypeTraverser extends XSD
// no element should appear after this point
if (content != null) {
if (restriction) {
- reportSchemaError("s4s-elt-must-match.1", new
Object[]{SchemaSymbols.ELT_RESTRICTION, "(annotation?, (simpleType?,
(minExclusive | minInclusive | maxExclusive | maxInclusive | totalDigits |
fractionDigits | length | minLength | maxLength | enumeration | whiteSpace |
pattern)*))", DOMUtil.getLocalName(content)}, content);
+ if (fSchemaHandler.fSchemaVersion ==
Constants.SCHEMA_VERSION_1_1) {
+ reportSchemaError("s4s-elt-must-match.1", new
Object[]{SchemaSymbols.ELT_RESTRICTION, "(annotation?, (simpleType?,
(minExclusive | minInclusive | maxExclusive | maxInclusive | totalDigits |
fractionDigits | length | minLength | maxLength | enumeration | whiteSpace |
pattern | assertion | explicitTimezone)*))", DOMUtil.getLocalName(content)},
content);
+ }
+ else {
+ reportSchemaError("s4s-elt-must-match.1", new
Object[]{SchemaSymbols.ELT_RESTRICTION, "(annotation?, (simpleType?,
(minExclusive | minInclusive | maxExclusive | maxInclusive | totalDigits |
fractionDigits | length | minLength | maxLength | enumeration | whiteSpace |
pattern)*))", DOMUtil.getLocalName(content)}, content);
+ }
}
else if (list) {
reportSchemaError("s4s-elt-must-match.1", new
Object[]{SchemaSymbols.ELT_LIST, "(annotation?, (simpleType?))",
DOMUtil.getLocalName(content)}, content);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
