markt 2004/10/06 15:46:41
Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch JspReader.java
Log:
Fix bug 31550. Jasper now compilies JSP when tag attribute ends in \\\\.
- Ported fix from TC5 branch.
Revision Changes Path
No revision
No revision
1.5.2.6 +4 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspReader.java
Index: JspReader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspReader.java,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -r1.5.2.5 -r1.5.2.6
--- JspReader.java 25 Aug 2004 20:53:31 -0000 1.5.2.5
+++ JspReader.java 6 Oct 2004 22:46:41 -0000 1.5.2.6
@@ -363,7 +363,10 @@
skip:
for (ret = mark(), ch = nextChar() ; ch != -1 ;
ret = mark(), prev = ch, ch = nextChar()) {
- if (ch == limit.charAt(0) && prev != '\\') {
+ if (ch == '\\' && prev == '\\') {
+ ch = 0; // Double \ is not an escape char anymore
+ }
+ else if (ch == limit.charAt(0) && prev != '\\') {
for (int i = 1 ; i < limlen ; i++) {
if (peekChar() == limit.charAt(i))
nextChar();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
