neilg 2002/10/04 14:49:51
Modified: java/src/org/apache/xerces/impl
XMLDocumentFragmentScannerImpl.java
XMLDocumentScannerImpl.java
Log:
enhance robustness when continue-after-fatal-error is set to true.
Revision Changes Path
1.23 +2 -2
xml-xerces/java/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java
Index: XMLDocumentFragmentScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XMLDocumentFragmentScannerImpl.java 24 Sep 2002 09:39:44 -0000 1.22
+++ XMLDocumentFragmentScannerImpl.java 4 Oct 2002 21:49:51 -0000 1.23
@@ -1113,6 +1113,7 @@
String name = fEntityScanner.scanName();
if (name == null) {
reportFatalError("NameRequiredInReference", null);
+ return;
}
// end
@@ -1696,7 +1697,6 @@
// in the middle of scanning some markup. -Ac
if (fMarkupDepth != 0) {
reportFatalError("PrematureEOF", null);
- throw e;
}
} // endOfFileHook()
1.27 +3 -2
xml-xerces/java/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java
Index: XMLDocumentScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLDocumentScannerImpl.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- XMLDocumentScannerImpl.java 25 Sep 2002 12:08:54 -0000 1.26
+++ XMLDocumentScannerImpl.java 4 Oct 2002 21:49:51 -0000 1.27
@@ -1033,7 +1033,8 @@
throws IOException, XNIException {
reportFatalError("PrematureEOF", null);
- throw e;
+ // in case continue-after-fatal-error set, should not do this...
+ //throw e;
} // endOfFileHook()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
