sandygao 2002/10/04 10:42:11
Modified: java/src/org/apache/xerces/impl/xs XMLSchemaValidator.java
Log:
Fixing bug [13275]: should fill all PSVI properties at once, before exiting from
handleStart/EndElement calls.
Revision Changes Path
1.113 +7 -9
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.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- XMLSchemaValidator.java 30 Sep 2002 14:10:15 -0000 1.112
+++ XMLSchemaValidator.java 4 Oct 2002 17:42:11 -0000 1.113
@@ -2133,6 +2133,12 @@
fCurrentPSVI.fValidationAttempted = ElementPSVI.VALIDATION_FULL;
}
+ if (fDefaultValue != null)
+ fCurrentPSVI.fSpecified = true;
+ fCurrentPSVI.fNil = fNil;
+ fCurrentPSVI.fMemberType = fValidatedInfo.memberType;
+ fCurrentPSVI.fNormalizedValue = fValidatedInfo.normalizedValue;
+
// pop error reporter context: get all errors for the current
// element, and remove them from the error list
String[] errors = fXSIErrorReporter.popContext();
@@ -2760,14 +2766,6 @@
fNormalizedStr.offset = 0;
fNormalizedStr.length = bufLen;
fDocumentHandler.characters(fNormalizedStr, null);
- }
-
- if (fAugPSVI) {
- if (this.fDefaultValue != null)
- fCurrentPSVI.fSpecified = true;
- fCurrentPSVI.fNil = fNil;
- fCurrentPSVI.fMemberType = fValidatedInfo.memberType;
- fCurrentPSVI.fNormalizedValue = fValidatedInfo.normalizedValue;
}
} // processElementContent
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
