[jbossweb-commits] JBossWeb SVN: r781 - in trunk: webapps/docs and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2008-09-17 09:55:42 -0400 (Wed, 17 Sep 2008)
New Revision: 781
Modified:
trunk/java/org/apache/jasper/compiler/Parser.java
trunk/webapps/docs/changelog.xml
Log:
- Port quote parsing fix.
Modified: trunk/java/org/apache/jasper/compiler/Parser.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Parser.java 2008-09-17 12:27:14 UTC (rev 780)
+++ trunk/java/org/apache/jasper/compiler/Parser.java 2008-09-17 13:55:42 UTC (rev 781)
@@ -771,9 +771,9 @@
}
if (currentChar == -1)
err.jspError(start, "jsp.error.unterminated", type +
"{");
- if (currentChar == '"')
+ if (currentChar == '"' && !singleQuoted)
doubleQuoted = !doubleQuoted;
- if (currentChar == '\'')
+ if (currentChar == '\'' && !doubleQuoted)
singleQuoted = !singleQuoted;
} while (currentChar != '}' || (singleQuoted || doubleQuoted));
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-09-17 12:27:14 UTC (rev 780)
+++ trunk/webapps/docs/changelog.xml 2008-09-17 13:55:42 UTC (rev 781)
@@ -36,6 +36,9 @@
</subsection>
<subsection name="Jasper">
<changelog>
+ <fix>
+ <bug>45427</bug>: Correct parsing of quoted stings in EL. (markt)
+ </fix>
</changelog>
</subsection>
</section>