svn commit: r920608 - /tomcat/trunk/java/org/apache/jasper/compiler/Validator.java

[kkolinko]

Author: kkolinko
Date: Tue Mar  9 01:28:14 2010
New Revision: 920608

URL: http://svn.apache.org/viewvc?rev=920608&view=rev
Log:
Revert r920110
Compatibility with JSP 1.2 tag libraries had to be covered by JSP 2.0 
specification,
see "Backwards Compatibility with JSP 1.2" in the Preface part of JSP 2.0 
specification,
and there is no provision for this feature.
Discussed in the Re: r920055 thread on dev@

Modified:
    tomcat/trunk/java/org/apache/jasper/compiler/Validator.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=920608&r1=920607&r2=920608&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Tue Mar  9 
01:28:14 2010
@@ -1077,15 +1077,12 @@ class Validator {
                 boolean deferred = false;
                 double libraryVersion = Double.parseDouble(
                         tagInfo.getTagLibrary().getRequiredVersion());
-                boolean elIgnored =
-                    pageInfo.isELIgnored() ||
-                    libraryVersion < 2.0;
                 boolean deferredSyntaxAllowedAsLiteral =
                     pageInfo.isDeferredSyntaxAllowedAsLiteral() ||
                     libraryVersion < 2.1;
 
                 ELNode.Nodes el = null;
-                if (!runtimeExpression && !elIgnored) {
+                if (!runtimeExpression && !pageInfo.isELIgnored()) {
                     el = ELParser.parse(attrs.getValue(i),
                             deferredSyntaxAllowedAsLiteral);
                     Iterator<ELNode> nodes = el.iterator();



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org