Author: remm
Date: Thu Nov 2 16:05:34 2006
New Revision: 470609
URL: http://svn.apache.org/viewvc?view=rev&rev=470609
Log:
- Fix a regression on classic EL expressions inside elements.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?view=diff&rev=470609&r1=470608&r2=470609
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Thu Nov
2 16:05:34 2006
@@ -1261,7 +1261,9 @@
ELNode.Nodes el = ELParser.parse(value);
if (el.containsEL() && !pageInfo.isELIgnored()
- && (!pageInfo.isDeferredSyntaxAllowedAsLiteral()
&& value.startsWith("#{"))) {
+ && ((!pageInfo.isDeferredSyntaxAllowedAsLiteral()
&& value.startsWith("#{"))
+ || value.startsWith("${"))) {
+
validateFunctions(el, n);
result = new Node.JspAttribute(tai, qName, uri,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
