From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 9 Mar 2010 01:28:14 +0000 (+0000)
Subject: Revert r920110
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b44b2c64d54719bf22eb1bc651e26401111c86c9;p=tomcat7.0

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@

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

diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java
index fd6b24519..8489e55c0 100644
--- a/java/org/apache/jasper/compiler/Validator.java
+++ b/java/org/apache/jasper/compiler/Validator.java
@@ -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();