Author: kkolinko Date: Sun May 11 18:23:43 2014 New Revision: 1593835 URL: http://svn.apache.org/r1593835 Log: Merged r1593834 from tomcat/trunk: Simplify. No functional change.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1593834 Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java?rev=1593835&r1=1593834&r2=1593835&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java Sun May 11 18:23:43 2014 @@ -53,7 +53,7 @@ public final class AstLiteralExpression char c = image.charAt(i); if (c == '\\' && i + 1 < size) { char c1 = image.charAt(i + 1); - if ((c1 == '#' || c1 == '$')) { + if (c1 == '#' || c1 == '$') { c = c1; i++; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org