Author: markt
Date: Tue Jul 29 09:24:40 2014
New Revision: 1614290
URL: http://svn.apache.org/r1614290
Log:
Use if/elseif for alternative branches.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/tc7.0.x/trunk:r1601909
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1614290&r1=1614289&r2=1614290&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 29 09:24:40 2014
@@ -34,11 +34,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Use if/elseif for alternative branches.
- http://svn.apache.org/r1601909
- +1: kkolinko, markt, schultz
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334#c15
http://people.apache.org/~markt/patches/2014-06-18-bug56334%23c15-tc6-v1.patch
+1: markt, kkolinko
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java?rev=1614290&r1=1614289&r2=1614290&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Parser.java Tue Jul 29
09:24:40 2014
@@ -728,10 +728,11 @@ class Parser implements TagConstants {
}
if (currentChar == -1)
err.jspError(start, "jsp.error.unterminated", type + "{");
- if (currentChar == '"' && !singleQuoted)
+ if (currentChar == '"' && !singleQuoted) {
doubleQuoted = !doubleQuoted;
- if (currentChar == '\'' && !doubleQuoted)
+ } else if (currentChar == '\'' && !doubleQuoted) {
singleQuoted = !singleQuoted;
+ }
} while (currentChar != '}' || (singleQuoted || doubleQuoted));
new Node.ELExpression(type, reader.getText(start, last), start,
parent);
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1614290&r1=1614289&r2=1614290&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jul 29 09:24:40 2014
@@ -81,6 +81,11 @@
<bug>56612</bug>: Correctly parse consecutive escaped single quotes
when
used in an EL expression. (markt)
</fix>
+ <scode>
+ Use <code>if { ... } else if { ... }</code> rather than multiple
+ <code>if { ... }</code> for alternative branches in the JSP parser.
+ (kkolinko)
+ </scode>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
