kinman 2003/11/25 14:59:27
Modified: jasper2/src/share/org/apache/jasper/compiler
JspDocumentParser.java
Log:
- Make sure that white spaces in template texts around <![CDATA[...]]>
are trimmed.
Revision Changes Path
1.74 +9 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java
Index: JspDocumentParser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspDocumentParser.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- JspDocumentParser.java 25 Nov 2003 18:51:47 -0000 1.73
+++ JspDocumentParser.java 25 Nov 2003 22:59:27 -0000 1.74
@@ -615,6 +615,9 @@
* See org.xml.sax.ext.LexicalHandler.
*/
public void comment(char[] buf, int offset, int len) throws SAXException {
+
+ processChars(); // Flush char buffer and remove white spaces
+
// ignore comments in the DTD
if (!inDTD) {
startMark =
@@ -630,6 +633,8 @@
* See org.xml.sax.ext.LexicalHandler.
*/
public void startCDATA() throws SAXException {
+
+ processChars(); // Flush char buffer and remove white spaces
startMark =
new Mark(path, locator.getLineNumber(), locator.getColumnNumber());
}
@@ -638,7 +643,7 @@
* See org.xml.sax.ext.LexicalHandler.
*/
public void endCDATA() throws SAXException {
- // do nothing
+ processChars(); // Flush char buffer and remove white spaces
}
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
