mrglavas 2004/03/16 10:44:28 Modified: java/src/org/apache/xerces/parsers DOMParserImpl.java Log: Fixing Bug #27716:
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27716 LSParser must recognize ''split-cdata-sections' parameter. Thanks to Naela Nissar for the patch. Also made a partial fix for Bug #27685. Parameter names are case-insensitive. Revision Changes Path 1.19 +10 -5 xml-xerces/java/src/org/apache/xerces/parsers/DOMParserImpl.java Index: DOMParserImpl.java =================================================================== RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/DOMParserImpl.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- DOMParserImpl.java 2 Mar 2004 22:08:50 -0000 1.18 +++ DOMParserImpl.java 16 Mar 2004 18:44:28 -0000 1.19 @@ -17,6 +17,7 @@ package org.apache.xerces.parsers; import java.io.StringReader; +import java.util.Locale; import java.util.Stack; import java.util.StringTokenizer; import java.util.Vector; @@ -160,6 +161,7 @@ Constants.DOM_CHARSET_OVERRIDES_XML_ENCODING, Constants.DOM_INFOSET, Constants.DOM_NAMESPACE_DECLARATIONS, + Constants.DOM_SPLIT_CDATA, Constants.DOM_SUPPORTED_MEDIATYPES_ONLY, Constants.DOM_CERTIFIED, Constants.DOM_WELLFORMED, @@ -194,6 +196,7 @@ // set other default values fConfiguration.setFeature (Constants.DOM_CANONICAL_FORM, false); fConfiguration.setFeature (Constants.DOM_CHARSET_OVERRIDES_XML_ENCODING, true); + fConfiguration.setFeature (Constants.DOM_SPLIT_CDATA, true); fConfiguration.setFeature (Constants.DOM_SUPPORTED_MEDIATYPES_ONLY, false); fConfiguration.setFeature (Constants.DOM_IGNORE_UNKNOWN_CHARACTER_DENORMALIZATIONS, true); @@ -389,9 +392,10 @@ "org.apache.xerces.dom.PSVIDocumentImpl"); } else { - // Constants.DOM_CHARSET_OVERRIDES_XML_ENCODING feature + // Constants.DOM_CHARSET_OVERRIDES_XML_ENCODING feature, + // Constants.DOM_SPLIT_CDATA feature, // or any Xerces feature - fConfiguration.setFeature (name, state); + fConfiguration.setFeature (name.toLowerCase(Locale.ENGLISH), state); } } @@ -617,8 +621,9 @@ || name.equalsIgnoreCase (Constants.DOM_IGNORE_UNKNOWN_CHARACTER_DENORMALIZATIONS) || name.equalsIgnoreCase (Constants.DOM_CANONICAL_FORM) || name.equalsIgnoreCase (Constants.DOM_SUPPORTED_MEDIATYPES_ONLY) + || name.equalsIgnoreCase (Constants.DOM_SPLIT_CDATA) || name.equalsIgnoreCase (Constants.DOM_CHARSET_OVERRIDES_XML_ENCODING)) { - return (fConfiguration.getFeature (name)) + return (fConfiguration.getFeature (name.toLowerCase(Locale.ENGLISH))) ? Boolean.TRUE : Boolean.FALSE; } @@ -697,7 +702,7 @@ // Recognize Xerces features. try { - fConfiguration.getFeature (name); + fConfiguration.getFeature(name.toLowerCase(Locale.ENGLISH)); return true; } catch (XMLConfigurationException e) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
