andyc 2003/01/31 13:58:16
Modified: java/src/org/apache/xerces/impl
XMLDocumentFragmentScannerImpl.java
XMLEntityScanner.java
Log:
Fix for my fix. ;) Now both CDATA sections and processing instruction
scanning works as expected.
Revision Changes Path
1.28 +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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- XMLDocumentFragmentScannerImpl.java 31 Jan 2003 21:35:22 -0000 1.27
+++ XMLDocumentFragmentScannerImpl.java 31 Jan 2003 21:58:15 -0000 1.28
@@ -963,7 +963,7 @@
while (true) {
fStringBuffer.clear();
- if (fEntityScanner.scanData("]]", fStringBuffer)) {
+ if (!fEntityScanner.scanData("]]", fStringBuffer)) {
if (fDocumentHandler != null && fStringBuffer.length > 0) {
fDocumentHandler.characters(fStringBuffer, null);
}
1.11 +4 -4 xml-xerces/java/src/org/apache/xerces/impl/XMLEntityScanner.java
Index: XMLEntityScanner.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLEntityScanner.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XMLEntityScanner.java 31 Jan 2003 21:35:22 -0000 1.10
+++ XMLEntityScanner.java 31 Jan 2003 21:58:16 -0000 1.11
@@ -1057,11 +1057,11 @@
if (DEBUG_BUFFER) {
System.out.print(")scanData: ");
XMLEntityManager.print(fCurrentEntity);
- System.out.println(" -> " + found);
+ System.out.println(" -> " + !found);
}
- return found;
+ return !found;
- } // scanData(String,XMLString)
+ } // scanData(String,XMLString):boolean
/**
* Skips a character appearing immediately on the input.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
