You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mu...@apache.org on 2010/03/26 04:41:16 UTC
svn commit: r927684 -
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
Author: mukulg
Date: Fri Mar 26 03:41:16 2010
New Revision: 927684
URL: http://svn.apache.org/viewvc?rev=927684&view=rev
Log:
fix for JIRA issue, XERCESJ-1432
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
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=927684&r1=927683&r2=927684&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 Fri Mar 26 03:41:16 2010
@@ -88,7 +88,7 @@ abstract class XSDAbstractTraverser {
protected XSAttributeChecker fAttrChecker = null;
protected boolean fValidateAnnotations = false;
- // a vector holding all the asserts up in the type hierarchy
+ // a vector to store all the assertions up in the type hierarchy
private Vector baseAsserts = new Vector();
// used to validate default/fixed attribute values
@@ -286,7 +286,7 @@ abstract class XSDAbstractTraverser {
}
/*
- * Method to find all assertions up in the type hierarchy
+ * Finding all assertions up in the type hierarchy
*/
private void getAssertsFromBaseTypes(XSSimpleType baseValidator) {
XSObjectList multiValFacetsOfBaseType = baseValidator.getMultiValueFacets();
@@ -483,7 +483,7 @@ abstract class XSDAbstractTraverser {
childNode = DOMUtil.getNextSiblingElement(childNode);
if (childNode != null) {
- // it's an error to have something after the annotation, in 'assert'
+ // it's an error to have something after the annotation, in an assertion
reportSchemaError("s4s-elt-invalid-content.1", new Object[]{DOMUtil.getLocalName(content),
DOMUtil.getLocalName(childNode)}, childNode);
}
@@ -707,7 +707,7 @@ abstract class XSDAbstractTraverser {
content = DOMUtil.getNextSiblingElement(content);
}
- // retrieve all assert definitions from all base types all the way up in the
+ // retrieve all assert definitions, from all base types all the way up in the
// type hierarchy. sets a global variable, 'baseAsserts' with all the base
// asserts.
if (fSchemaHandler.fSchemaVersion == Constants.SCHEMA_VERSION_1_1) {
@@ -719,6 +719,7 @@ abstract class XSDAbstractTraverser {
assertData = new Vector();
}
assertData.addAll(baseAsserts);
+ baseAsserts.clear(); // clear vector baseAsserts
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org