elena 2003/06/05 09:43:21
Modified: java/src/org/apache/xerces/dom DOMConfigurationImpl.java
java/src/org/apache/xerces/parsers DOMBuilderImpl.java
Log:
Applying patches from Venu ([EMAIL PROTECTED]) for bugs 20429 and 20431
Revision Changes Path
1.4 +8 -5
xml-xerces/java/src/org/apache/xerces/dom/DOMConfigurationImpl.java
Index: DOMConfigurationImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DOMConfigurationImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DOMConfigurationImpl.java 31 Dec 2002 01:55:05 -0000 1.3
+++ DOMConfigurationImpl.java 5 Jun 2003 16:43:21 -0000 1.4
@@ -542,8 +542,8 @@
// REVISIT: Recognizes DOM L3 default features only.
// Does not yet recognize Xerces features.
- if (value == Boolean.TRUE || value == Boolean.FALSE) {
- boolean state = (value == Boolean.TRUE) ? true : false;
+ if(value instanceof Boolean){
+ boolean state = ((Boolean)value).booleanValue();
if (name.equals(Constants.DOM_COMMENTS)) {
features = (short) (state ? features | COMMENTS : features &
~COMMENTS);
@@ -877,14 +877,17 @@
|| name.equals(Constants.DOM_CANONICAL_FORM)
|| name.equals(Constants.DOM_VALIDATE_IF_SCHEMA)) {
if (state instanceof Boolean) {
- return (state == Boolean.TRUE) ? false : true;
+ return (state.equals(Boolean.TRUE)) ? false : true;
}
return false;
}
else if ( name.equals(Constants.DOM_NAMESPACE_DECLARATIONS)
||
name.equals(Constants.DOM_WHITESPACE_IN_ELEMENT_CONTENT)
|| name.equals(SEND_PSVI)) {
- return (state == Boolean.TRUE) ? true : false;
+ if (state instanceof Boolean) {
+ return (state.equals(Boolean.TRUE)) ? true : false;
+ }
+ return false;
}
else {
1.36 +5 -5
xml-xerces/java/src/org/apache/xerces/parsers/DOMBuilderImpl.java
Index: DOMBuilderImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/DOMBuilderImpl.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- DOMBuilderImpl.java 27 May 2003 22:09:21 -0000 1.35
+++ DOMBuilderImpl.java 5 Jun 2003 16:43:21 -0000 1.36
@@ -313,8 +313,8 @@
*/
public void setParameter(String name, Object value) throws DOMException {
// set features
- if (value == Boolean.TRUE || value == Boolean.FALSE) {
- boolean state = (value == Boolean.TRUE) ? true : false;
+ if(value instanceof Boolean){
+ boolean state = ((Boolean)value).booleanValue();
try {
if (name.equals(Constants.DOM_COMMENTS)) {
fConfiguration.setFeature(INCLUDE_COMMENTS_FEATURE, state);
@@ -628,8 +628,8 @@
}
public boolean canSetParameter(String name, Object value) {
- if (value == Boolean.TRUE || value == Boolean.FALSE) {
- boolean state = (value == Boolean.TRUE) ? true : false;
+ if(value instanceof Boolean){
+ boolean state = ((Boolean)value).booleanValue();
if (name.equals(Constants.DOM_INFOSET)
|| name.equals(Constants.DOM_SUPPORTED_MEDIATYPES_ONLY)
|| name.equals(Constants.DOM_CANONICAL_FORM)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
