Author: markt
Date: Tue Apr 17 18:33:23 2007
New Revision: 529823

URL: http://svn.apache.org/viewvc?view=rev&rev=529823
Log:
Revert previous fix for 41869 and port Remy's suggested fix for TC6.

Modified:
    tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Validator.java

Modified: 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Validator.java
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Validator.java?view=diff&rev=529823&r1=529822&r2=529823
==============================================================================
--- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Validator.java 
(original)
+++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Validator.java 
Tue Apr 17 18:33:23 2007
@@ -962,7 +962,7 @@
                                                         null,
                                                         false);
                         }
-                        if (jspAttrs[i].isExpression()) {
+                        if (isExpression(n, attrs.getValue(i))) {
                             tagDataAttrs.put(attrs.getQName(i),
                                              TagData.REQUEST_TIME_VALUE);
                         } else {
@@ -1115,7 +1115,7 @@
 
                         
                         result = new Node.JspAttribute(qName, uri, localName,
-                                                       value, true, el,
+                                                       value, false, el,
                                                        dynamic);
                     } else {
                         value = value.replace(Constants.HACK_CHAR, '$');



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to