You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ne...@apache.org on 2003/04/16 13:46:15 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/jaxp DocumentBuilderImpl.java SAXParserImpl.java
neeraj 2003/04/16 04:46:15
Modified: java/src/org/apache/xerces/jaxp DocumentBuilderImpl.java
SAXParserImpl.java
Log:
Fix for bug 18937. Thanks Venu for the patch.
Revision Changes Path
1.20 +11 -9 xml-xerces/java/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java
Index: DocumentBuilderImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DocumentBuilderImpl.java 11 Jan 2003 00:20:50 -0000 1.19
+++ DocumentBuilderImpl.java 16 Apr 2003 11:46:13 -0000 1.20
@@ -156,16 +156,18 @@
domParser.setFeature(name, ((Boolean)val).booleanValue());
} else {
// Assume property
-
if (JAXP_SCHEMA_LANGUAGE.equals(name)) {
// JAXP 1.2 support
- if (W3C_XML_SCHEMA.equals(val)) {
- domParser.setFeature(
- Constants.XERCES_FEATURE_PREFIX +
- Constants.SCHEMA_VALIDATION_FEATURE, true);
- // this should allow us not to emit DTD errors, as expected by the
- // spec when schema validation is enabled
- domParser.setProperty(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
+ //None of the properties will take effect till the setValidating(true) has been called
+ if ( W3C_XML_SCHEMA.equals(val) ) {
+ if( isValidating() ) {
+ domParser.setFeature(
+ Constants.XERCES_FEATURE_PREFIX +
+ Constants.SCHEMA_VALIDATION_FEATURE, true);
+ // this should allow us not to emit DTD errors, as expected by the
+ // spec when schema validation is enabled
+ domParser.setProperty(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
+ }
}
} else {
// Let Xerces code handle the property
1.19 +12 -8 xml-xerces/java/src/org/apache/xerces/jaxp/SAXParserImpl.java
Index: SAXParserImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/jaxp/SAXParserImpl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SAXParserImpl.java 11 Jan 2003 00:20:50 -0000 1.18
+++ SAXParserImpl.java 16 Apr 2003 11:46:14 -0000 1.19
@@ -187,15 +187,19 @@
throws SAXNotRecognizedException, SAXNotSupportedException
{
if (JAXP_SCHEMA_LANGUAGE.equals(name)) {
- // JAXP 1.2 support
- if (W3C_XML_SCHEMA.equals(value)) {
- schemaLanguage = W3C_XML_SCHEMA;
- xmlReader.setFeature(Constants.XERCES_FEATURE_PREFIX +
+ // JAXP 1.2 support
+ if ( W3C_XML_SCHEMA.equals(value) ) {
+ //None of the properties will take effect till the setValidating(true) has been called
+ if( isValidating() ) {
+ schemaLanguage = W3C_XML_SCHEMA;
+ xmlReader.setFeature(Constants.XERCES_FEATURE_PREFIX +
Constants.SCHEMA_VALIDATION_FEATURE,
true);
- // this will allow the parser not to emit DTD-related
- // errors, as the spec demands
- xmlReader.setProperty(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
+ // this will allow the parser not to emit DTD-related
+ // errors, as the spec demands
+ xmlReader.setProperty(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
+ }
+
} else if (value == null) {
schemaLanguage = null;
xmlReader.setFeature(Constants.XERCES_FEATURE_PREFIX +
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org