Author: kkolinko
Date: Wed Jun 11 14:24:10 2014
New Revision: 1601909
URL: http://svn.apache.org/r1601909
Log:
Code cleanup: use if/elseif for alternative branches.
Discussed in "Re:r1601787" thread. It is partial backport of r1543356.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Parser.java?rev=1601909&r1=1601908&r2=1601909&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Parser.java Wed Jun 11
14:24:10 2014
@@ -752,10 +752,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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
