You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by el...@apache.org on 2002/01/22 21:36:25 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl XMLDocumentScannerImpl.java
elena 02/01/22 12:36:25
Modified: java/src/org/apache/xerces/impl XMLDocumentScannerImpl.java
Log:
If an XML document did not have any internal DTD subset we were ignoring settings
for load-external-dtd feature.
Revision Changes Path
1.11 +3 -4 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XMLDocumentScannerImpl.java 22 Jan 2002 16:42:26 -0000 1.10
+++ XMLDocumentScannerImpl.java 22 Jan 2002 20:36:25 -0000 1.11
@@ -109,7 +109,7 @@
* @author Arnaud Le Hors, IBM
* @author Eric Ye, IBM
*
- * @version $Id: XMLDocumentScannerImpl.java,v 1.10 2002/01/22 16:42:26 neilg Exp $
+ * @version $Id: XMLDocumentScannerImpl.java,v 1.11 2002/01/22 20:36:25 elena Exp $
*/
public class XMLDocumentScannerImpl
extends XMLDocumentFragmentScannerImpl {
@@ -289,7 +289,7 @@
catch (XMLConfigurationException e) {
fLoadExternalDTD = true;
}
-
+
// xerces properties
fDTDScanner = (XMLDTDScanner)componentManager.getProperty(DTD_SCANNER);
@@ -705,7 +705,7 @@
setDispatcher(fDTDDispatcher);
return true;
}
- if (fDoctypeSystemId != null) {
+ if (fDoctypeSystemId != null && (fValidation || fLoadExternalDTD)) {
setScannerState(SCANNER_STATE_DTD_EXTERNAL);
setDispatcher(fDTDDispatcher);
return true;
@@ -770,7 +770,6 @@
*/
public boolean dispatch(boolean complete)
throws IOException, XNIException {
-
fEntityManager.setEntityHandler(null);
try {
boolean again;
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org