mrglavas 2005/02/24 10:34:09
Modified: java/src/org/apache/xerces/impl XMLDocumentScannerImpl.java
Log:
Fixing a bug reported by Ritu Raj Tiwari on xerces-j-dev. When resolving
an external subset if there's already a DTD in the grammar pool do not
read the input source.
Revision Changes Path
1.49 +8 -3
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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- XMLDocumentScannerImpl.java 4 Oct 2004 21:45:48 -0000 1.48
+++ XMLDocumentScannerImpl.java 24 Feb 2005 18:34:09 -0000 1.49
@@ -1164,8 +1164,13 @@
fDocumentHandler.doctypeDecl(fDoctypeName,
fDoctypePublicId, fDoctypeSystemId, null);
}
try {
- fDTDScanner.setInputSource(src);
- while (fDTDScanner.scanDTDExternalSubset(true));
+ if (fValidationManager == null ||
!fValidationManager.isCachedDTD()) {
+ fDTDScanner.setInputSource(src);
+ while (fDTDScanner.scanDTDExternalSubset(true));
+ }
+ else {
+ fDTDScanner.setInputSource(null);
+ }
}
finally {
fEntityManager.setEntityHandler(XMLDocumentScannerImpl.this);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
