elena 2002/07/26 12:30:50
Modified: java/src/org/apache/xerces/parsers AbstractDOMParser.java
Log:
Add check to avoid NPE.
Revision Changes Path
1.66 +7 -3
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.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- AbstractDOMParser.java 17 Jul 2002 20:11:41 -0000 1.65
+++ AbstractDOMParser.java 26 Jul 2002 19:30:50 -0000 1.66
@@ -1686,7 +1686,9 @@
}
fInDTD = true;
- fBaseURIStack.push(locator.getBaseSystemId());
+ if (locator != null) {
+ fBaseURIStack.push(locator.getBaseSystemId());
+ }
if (fDeferNodeExpansion || fDocumentImpl != null) {
fInternalSubset = new StringBuffer(1024);
}
@@ -1706,7 +1708,9 @@
System.out.println("==>endDTD()");
}
fInDTD = false;
- fBaseURIStack.pop();
+ if (!fBaseURIStack.isEmpty()) {
+ fBaseURIStack.pop();
+ }
String internalSubset = fInternalSubset != null && fInternalSubset.length()
> 0
? fInternalSubset.toString() : null;
if (fDeferNodeExpansion) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
