Author: mukulg
Date: Sat Feb 20 15:23:08 2010
New Revision: 912127
URL: http://svn.apache.org/viewvc?rev=912127&view=rev
Log:
fix for JIRA issue, XERCESJ-1422
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
(contents, props changed)
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java?rev=912127&r1=912126&r2=912127&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
Sat Feb 20 15:23:08 2010
@@ -31,7 +31,6 @@
import org.apache.xerces.impl.xs.XSAnnotationImpl;
import org.apache.xerces.impl.xs.XSAttributeGroupDecl;
import org.apache.xerces.impl.xs.XSAttributeUseImpl;
-import org.apache.xerces.impl.xs.XSComplexTypeDecl;
import org.apache.xerces.impl.xs.XSElementDecl;
import org.apache.xerces.impl.xs.XSParticleDecl;
import org.apache.xerces.impl.xs.XSWildcardDecl;
@@ -940,7 +939,7 @@
}
// If minOccurs=maxOccurs=0, no component is specified
- if (min == 0 && max== 0) {
+ if (min == 0 && max == 0) {
particle.fType = XSParticleDecl.PARTICLE_EMPTY;
return null;
}
@@ -953,7 +952,8 @@
if (processingAllEl) {
// XML Schema 1.1 - maxOccurs can have a value > 1
if (max != 1 && fSchemaHandler.fSchemaVersion !=
Constants.SCHEMA_VERSION_1_1) {
- reportSchemaError("cos-all-limited.2", new Object[]{new
Integer(max),
+ reportSchemaError("cos-all-limited.2", new Object[]{
+ (max == -1) ? SchemaSymbols.ATTVAL_UNBOUNDED :
Integer.toString(max),
((XSElementDecl)particle.fValue).getName()}, parent);
max = 1;
if (min > 1)
Propchange:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat Feb 20 15:23:08 2010
@@ -1 +1 @@
-Author Date Id Revision
+Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
