From c9e495d707f69169024fc4eac577d69aad8b4d33 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 17 Sep 2008 12:46:45 +0000 Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45427 Yet another EL bug. Correct paring of quoted stings. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@696278 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/compiler/Parser.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/java/org/apache/jasper/compiler/Parser.java b/java/org/apache/jasper/compiler/Parser.java index 9e2780c2b..b8598a17a 100644 --- a/java/org/apache/jasper/compiler/Parser.java +++ b/java/org/apache/jasper/compiler/Parser.java @@ -27,7 +27,6 @@ import javax.servlet.jsp.tagext.TagFileInfo; import javax.servlet.jsp.tagext.TagInfo; import javax.servlet.jsp.tagext.TagLibraryInfo; -import org.apache.jasper.Constants; import org.apache.jasper.JasperException; import org.apache.jasper.JspCompilationContext; import org.xml.sax.Attributes; @@ -786,9 +785,9 @@ class Parser implements TagConstants { } 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)); -- 2.11.0