mrglavas 2004/03/11 08:10:46
Modified: java/src/org/apache/xerces/impl/xs XMLSchemaValidator.java
java/src/org/apache/xerces/impl/xs/identity Field.java
Log:
Some cleanup from the last commit.
Revision Changes Path
1.154 +6 -2
xml-xerces/java/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
Index: XMLSchemaValidator.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- XMLSchemaValidator.java 10 Mar 2004 23:05:24 -0000 1.153
+++ XMLSchemaValidator.java 11 Mar 2004 16:10:46 -0000 1.154
@@ -1240,7 +1240,11 @@
fInCDATA = false;
fMatcherStack.clear();
- fMayMatchFieldMap.clear();
+
+ if (!fMayMatchFieldMap.isEmpty()) {
+ // should only clear this if the last schema had identity constraints.
+ fMayMatchFieldMap.clear();
+ }
// get error reporter
fXSIErrorReporter.reset((XMLErrorReporter)
componentManager.getProperty(ERROR_REPORTER));
1.17 +1 -15
xml-xerces/java/src/org/apache/xerces/impl/xs/identity/Field.java
Index: Field.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/identity/Field.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Field.java 10 Mar 2004 23:05:24 -0000 1.16
+++ Field.java 11 Mar 2004 16:10:46 -0000 1.17
@@ -41,10 +41,6 @@
/** Identity constraint. */
protected IdentityConstraint fIdentityConstraint;
- // whether this field can be matched; used to catch instance documents
- // that try and match a field several times in the same scope.
- // protected boolean mayMatch = true;
-
//
// Constructors
//
@@ -59,16 +55,6 @@
//
// Public methods
//
-
- /** // sets mayMatch
- public void setMayMatch(boolean b) {
- mayMatch = b;
- } // setMayMatch(boolean);
-
- // returns mayMatch
- public boolean mayMatch() {
- return mayMatch;
- } // mayMatch():boolean **/
/** Returns the field XPath. */
public org.apache.xerces.impl.xpath.XPath getXPath() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
