elena 2002/08/01 10:12:09
Modified: java/src/org/apache/xerces/impl XMLDTDScannerImpl.java
XMLDocumentScannerImpl.java
Log:
Fixing bug http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11176
Revision Changes Path
1.25 +7 -1
xml-xerces/java/src/org/apache/xerces/impl/XMLDTDScannerImpl.java
Index: XMLDTDScannerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLDTDScannerImpl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XMLDTDScannerImpl.java 27 Jun 2002 21:23:08 -0000 1.24
+++ XMLDTDScannerImpl.java 1 Aug 2002 17:12:09 -0000 1.25
@@ -263,6 +263,12 @@
* @throws IOException Thrown on i/o error.
*/
public void setInputSource(XMLInputSource inputSource) throws IOException {
+ if (inputSource == null) {
+ // no system id was available
+ fDTDHandler.startDTD(null, null);
+ fDTDHandler.endDTD(null);
+ return;
+ }
fEntityManager.setEntityHandler(this);
fEntityManager.startDTDEntity(inputSource);
} // setInputSource(XMLInputSource)
1.20 +4 -1
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XMLDocumentScannerImpl.java 11 Jul 2002 14:37:31 -0000 1.19
+++ XMLDocumentScannerImpl.java 1 Aug 2002 17:12:09 -0000 1.20
@@ -713,6 +713,9 @@
setDispatcher(fDTDDispatcher);
return true;
}
+ if (fDoctypeSystemId == null) {
+ fDTDScanner.setInputSource(null);
+ }
if (fDoctypeSystemId != null && ((fValidation ||
fLoadExternalDTD)
&& (fValidationManager == null ||
!fValidationManager.isCachedDTD()))) {
setScannerState(SCANNER_STATE_DTD_EXTERNAL);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
