elena 2003/11/06 16:20:41
Modified: java/src/org/apache/xerces/parsers AbstractDOMParser.java
Log:
Fixing NPE: setXMLVersion can't accept null values
Revision Changes Path
1.92 +7 -4
xml-xerces/java/src/org/apache/xerces/parsers/AbstractDOMParser.java
Index: AbstractDOMParser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/AbstractDOMParser.java,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- AbstractDOMParser.java 4 Nov 2003 05:15:16 -0000 1.91
+++ AbstractDOMParser.java 7 Nov 2003 00:20:41 -0000 1.92
@@ -585,7 +585,8 @@
if (!fDeferNodeExpansion) {
if (fCurrentEntityDecl != null && !fFilterReject) {
fCurrentEntityDecl.setXmlEncoding(encoding);
- fCurrentEntityDecl.setXmlVersion(version);
+ if (version != null)
+ fCurrentEntityDecl.setXmlVersion(version);
}
}
else {
@@ -854,13 +855,15 @@
// REVISIT: when DOM Level 3 is REC rely on Document.support
// instead of specific class
if (fDocumentImpl != null) {
- fDocumentImpl.setXmlVersion(version);
+ if (version != null)
+ fDocumentImpl.setXmlVersion(version);
fDocumentImpl.setXmlEncoding(encoding);
fDocumentImpl.setXmlStandalone("yes".equals(standalone));
}
}
else {
- fDeferredDocumentImpl.setXmlVersion(version);
+ if (version != null)
+ fDeferredDocumentImpl.setXmlVersion(version);
fDeferredDocumentImpl.setXmlEncoding(encoding);
fDeferredDocumentImpl.setXmlStandalone("yes".equals(standalone));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
