You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ne...@apache.org on 2001/11/06 20:51:12 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl XMLDTDScannerImpl.java
neilg 01/11/06 11:51:12
Modified: java/src/org/apache/xerces/impl XMLDTDScannerImpl.java
Log:
apply a patch from Glenn Marcy to fix bug #2206
Revision Changes Path
1.10 +13 -6 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XMLDTDScannerImpl.java 2001/10/23 09:58:56 1.9
+++ XMLDTDScannerImpl.java 2001/11/06 19:51:11 1.10
@@ -102,7 +102,7 @@
* @author Glenn Marcy, IBM
* @author Eric Ye, IBM
*
- * @version $Id: XMLDTDScannerImpl.java,v 1.9 2001/10/23 09:58:56 andyc Exp $
+ * @version $Id: XMLDTDScannerImpl.java,v 1.10 2001/11/06 19:51:11 neilg Exp $
*/
public class XMLDTDScannerImpl
extends XMLScanner
@@ -1676,12 +1676,17 @@
// These tests are split so that we handle cases like
// '<<![' and '<!<![' which we might otherwise miss.
//
- if (fEntityScanner.skipChar('!')
- && fEntityScanner.skipChar('[')) {
- if (fDTDHandler != null) {
- fIgnoreConditionalBuffer.append("![");
+ if (fEntityScanner.skipChar('!')) {
+ if(fEntityScanner.skipChar('[')) {
+ if (fDTDHandler != null) {
+ fIgnoreConditionalBuffer.append("![");
+ }
+ fIncludeSectDepth++;
+ } else {
+ if (fDTDHandler != null) {
+ fIgnoreConditionalBuffer.append("!");
+ }
}
- fIncludeSectDepth++;
}
}
else if (fEntityScanner.skipChar(']')) {
@@ -1712,6 +1717,8 @@
fDTDHandler.endConditional();
}
return;
+ } else if(fDTDHandler != null) {
+ fIgnoreConditionalBuffer.append('>');
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org