Author: markt
Date: Fri Dec 16 13:13:36 2011
New Revision: 1215121
URL: http://svn.apache.org/viewvc?rev=1215121&view=rev
Log:
Better fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=52335
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java?rev=1215121&r1=1215120&r2=1215121&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Fri Dec 16
13:13:36 2011
@@ -1295,6 +1295,7 @@ class Parser implements TagConstants {
}
while (reader.hasMoreInput()) {
+ int prev = ch;
ch = reader.nextChar();
if (ch == '<') {
reader.pushChar();
@@ -1319,8 +1320,9 @@ class Parser implements TagConstants {
}
char next = (char) reader.peekChar();
// Looking for \% or \$ or \#
- if (next == '%' || ((next == '$' || next == '#') &&
- !pageInfo.isELIgnored())) {
+ if ((prev == '<' && next == '%') ||
+ ((next == '$' || next == '#') &&
+ !pageInfo.isELIgnored())) {
ch = reader.nextChar();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
