kinman 2003/11/25 10:51:47
Modified: jasper2/src/share/org/apache/jasper/compiler
JspDocumentParser.java
Log:
- In XML syntax, recognize \$ escape sequence in template text.
Revision Changes Path
1.73 +11 -8
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.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- JspDocumentParser.java 24 Nov 2003 23:51:10 -0000 1.72
+++ JspDocumentParser.java 25 Nov 2003 18:51:47 -0000 1.73
@@ -523,18 +523,21 @@
ttext.write(ch);
lastCh = ch;
}
+ } else if (lastCh == '\\' && ch == '$') {
+ ttext.write('$');
+ ch = 0; // Not start of EL anymore
} else {
- if ((lastCh == '$') && (ch != '{')) {
- ttext.write('$');
+ if (lastCh == '$' || lastCh == '\\') {
+ ttext.write(lastCh);
}
- if (ch != '$') {
+ if (ch != '$' && ch != '\\') {
ttext.write(ch);
}
}
lastCh = ch;
}
- if (lastCh == '$') {
- ttext.write('$');
+ if (lastCh == '$' || lastCh == '\\') {
+ ttext.write(lastCh);
}
if (ttext.size() > 0) {
new Node.TemplateText(ttext.toString(), startMark, current);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
