You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/09/17 14:46:46 UTC
svn commit: r696278 -
/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
Author: markt
Date: Wed Sep 17 05:46:45 2008
New Revision: 696278
URL: http://svn.apache.org/viewvc?rev=696278&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45427
Yet another EL bug. Correct paring of quoted stings.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java?rev=696278&r1=696277&r2=696278&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Wed Sep 17 05:46:45 2008
@@ -27,7 +27,6 @@
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 @@
}
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));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org