Author: mrglavas
Date: Fri Sep 28 19:55:35 2012
New Revision: 1391618
URL: http://svn.apache.org/viewvc?rev=1391618&view=rev
Log:
JIRA Issue #1589: https://issues.apache.org/jira/browse/XERCESJ-1589. Fixing an
NPE. Before processing the 'defaultOpenContent' element first check that we're
in XML Schema 1.1 mode.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java?rev=1391618&r1=1391617&r2=1391618&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
Fri Sep 28 19:55:35 2012
@@ -1473,8 +1473,8 @@ public class XSDHandler {
String componentType = DOMUtil.getLocalName(globalComp);
// In XML Schema 1.1, a defaultOpenContent element may
occur
- if
(componentType.equals(SchemaSymbols.ELT_DEFAULTOPENCONTENT)) {
- if (fSchemaVersion < Constants.SCHEMA_VERSION_1_1 ||
!dependenciesCanOccur) {
+ if (fSchemaVersion >= Constants.SCHEMA_VERSION_1_1 &&
componentType.equals(SchemaSymbols.ELT_DEFAULTOPENCONTENT)) {
+ if (!dependenciesCanOccur) {
reportSchemaError("s4s-elt-invalid-content.3", new
Object [] {componentType}, globalComp);
}
final SchemaGrammar currSG =
fGrammarBucket.getGrammar(currSchemaDoc.fTargetNamespace);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
