Attached is the patch for bug# 3270.
As i found, my previous patch for bug# 2093 isn't committed.I request anyone
of the committers to review the patches and commit them.
regards,
Pavani
--
Pavani Mukthipudi
Sun Microsystems Inc.
Phone: 080 - 2298989 Extn: 87390
? build
? patch1.txt
Index: src/org/apache/xerces/validators/common/XMLValidator.java
===================================================================
RCS file:
/home/cvspublic/xml-xerces/java/src/org/apache/xerces/validators/common/Attic/XMLValidator.java,v
retrieving revision 1.186
diff -c -r1.186 XMLValidator.java
*** src/org/apache/xerces/validators/common/XMLValidator.java 2001/08/09 19:21:49
1.186
--- src/org/apache/xerces/validators/common/XMLValidator.java 2001/08/31 03:46:22
***************
*** 502,510 ****
fDynamicDisabledByValidation = true;
}
fValidating = fValidationEnabled;
! if (fValidating) {
! initDataTypeValidators();
! }
}
/** Returns true if validation is enabled. */
--- 502,510 ----
fDynamicDisabledByValidation = true;
}
fValidating = fValidationEnabled;
! // if (fValidating) {
! // initDataTypeValidators();
! // }
}
/** Returns true if validation is enabled. */
***************
*** 563,571 ****
fValidationEnabledByDynamic = true;
}
fValidating = fValidationEnabled;
! if (fValidating) {
! initDataTypeValidators();
! }
}
/** Returns true if validation is dynamic. */
--- 563,571 ----
fValidationEnabledByDynamic = true;
}
fValidating = fValidationEnabled;
! // if (fValidating) {
! // initDataTypeValidators();
! // }
}
/** Returns true if validation is dynamic. */
***************
*** 1143,1148 ****
--- 1143,1151 ----
fStringPool.resetShuffleCount();
}
+ // Datatype validators should be initilized irrespective of the validation
+feature
+ initDataTypeValidators();
+
if (fGrammar != null && fGrammarIsDTDGrammar) {
fAttrListHandle = addDTDDefaultAttributes(element, fAttrList,
fAttrListHandle, fValidating, fStandaloneReader != -1);
}
***************
*** 2508,2514 ****
int uri = fStringPool.addSymbol(attrList.getAttValue(index));
fNamespacesScope.setNamespaceForPrefix(nsPrefix, uri);
! if (fValidating && fSchemaValidation) {
boolean seeXsi = false;
String attrValue =
fStringPool.toString(attrList.getAttValue(index));
--- 2511,2518 ----
int uri = fStringPool.addSymbol(attrList.getAttValue(index));
fNamespacesScope.setNamespaceForPrefix(nsPrefix, uri);
! // if (fValidating && fSchemaValidation) {
! if (fSchemaValidation) {
boolean seeXsi = false;
String attrValue =
fStringPool.toString(attrList.getAttValue(index));
***************
*** 2526,2533 ****
String uri = null;
// if validating, walk through the list again to deal with "xsi:...."
- if (fValidating && fSchemaValidation) {
fLocationUriPairs.clear();
if (!fSeenRootElement) {
// we are at the root element
--- 2530,2538 ----
String uri = null;
// if validating, walk through the list again to deal with "xsi:...."
+ // if (fValidating && fSchemaValidation) {
+ if (fSchemaValidation) {
fLocationUriPairs.clear();
if (!fSeenRootElement) {
// we are at the root element
Index: src/org/apache/xerces/validators/schema/GeneralAttrCheck.java
===================================================================
RCS file:
/home/cvspublic/xml-xerces/java/src/org/apache/xerces/validators/schema/Attic/GeneralAttrCheck.java,v
retrieving revision 1.14
diff -c -r1.14 GeneralAttrCheck.java
*** src/org/apache/xerces/validators/schema/GeneralAttrCheck.java 2001/08/07
17:13:57 1.14
--- src/org/apache/xerces/validators/schema/GeneralAttrCheck.java 2001/08/31
03:46:26
***************
*** 879,885 ****
private GeneralAttrCheck() {}
public GeneralAttrCheck (XMLErrorReporter er, DatatypeValidatorFactoryImpl
datatypeRegistry) {
fErrorReporter = er;
! fDatatypeRegistry = fDatatypeRegistry;
synchronized (getClass()) {
if (fExtraDVs[DT_ANYURI] == null) {
// step 5: register all datatype validators for new types
--- 879,885 ----
private GeneralAttrCheck() {}
public GeneralAttrCheck (XMLErrorReporter er, DatatypeValidatorFactoryImpl
datatypeRegistry) {
fErrorReporter = er;
! fDatatypeRegistry = datatypeRegistry;
synchronized (getClass()) {
if (fExtraDVs[DT_ANYURI] == null) {
// step 5: register all datatype validators for new types
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
