kinman 2003/09/22 17:08:22
Modified: jasper2/src/share/org/apache/jasper/compiler Parser.java
Log:
- Fix a bug in Parser.isTemplateText():
Since '%' is not a delimiter in JspReader.parseToken(), an expression
"<%String s;%>" after a template text would be treated as a template
text when mappedfile option is set to true, and got concatenated to
the template text.
Revision Changes Path
1.81 +4 -16
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- Parser.java 2 Sep 2003 21:39:59 -0000 1.80
+++ Parser.java 23 Sep 2003 00:08:22 -0000 1.81
@@ -1424,19 +1424,7 @@
String tagIdentifier = reader.parseToken(false);
reader.reset(m);
- if (tagIdentifier.equals("%--")) {
- return false;
- }
- if (tagIdentifier.equals("%@")) {
- return false;
- }
- if (tagIdentifier.equals("%!")) {
- return false;
- }
- if (tagIdentifier.equals("%=")) {
- return false;
- }
- if (tagIdentifier.equals("%")) {
+ if (tagIdentifier.startsWith("%")) {
return false;
}
if (tagIdentifier.startsWith("jsp:")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
