Author: markt
Date: Wed Oct 10 14:28:05 2012
New Revision: 1396617
URL: http://svn.apache.org/viewvc?rev=1396617&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53986
Ensure current and reset Mark are always separate objects. Corrects issue with
parsing JSP comments that end with "---%>".
Added:
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspReader.java
- copied unchanged from r1396615,
tomcat/trunk/test/org/apache/jasper/compiler/TestJspReader.java
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53986.jsp
- copied unchanged from r1396615,
tomcat/trunk/test/webapp-3.0/bug53986.jsp
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1396615
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java?rev=1396617&r1=1396616&r2=1396617&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java Wed Oct
10 14:28:05 2012
@@ -432,7 +432,7 @@ class JspReader {
if (peekChar() == limit.charAt(i)) {
nextChar();
} else {
- setCurrent(restart);
+ current.init(restart, singleFile);
continue skip;
}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1396617&r1=1396616&r2=1396617&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Oct 10 14:28:05 2012
@@ -53,6 +53,18 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
+<section name="Tomcat 7.0.33 (markt)">
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>53986</bug>: Correct a regression introduced by the fix for
+ <bug>53713</bug>. JSP comments that ended with the sequence ---%>
(or
+ any similar sequence with a odd number of - characters) was not
+ correctly parsed. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 7.0.32 (markt)" rtext="2012-10-09">
<subsection name="Catalina">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
