- Fix a regression on classic EL expressions inside elements.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@470609 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java
index f1de408..0acfbb1 100644 (file)
--- a/java/org/apache/jasper/compiler/Validator.java
+++ b/java/org/apache/jasper/compiler/Validator.java
@@ -1261,7 +1261,9 @@ class Validator {
                     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,