- Add 1.2 as well.

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

diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java b/java/org/apache/jasper/compiler/TagFileProcessor.java
index fcaf960..dcfac4d 100644 (file)
--- a/java/org/apache/jasper/compiler/TagFileProcessor.java
+++ b/java/org/apache/jasper/compiler/TagFileProcessor.java
@@ -273,7 +273,7 @@ class TagFileProcessor {
                 }
             }
 
-            if ("2.0".equals(tagLibInfo.getRequiredVersion())
+            if (("2.0".equals(tagLibInfo.getRequiredVersion()) || ("1.2".equals(tagLibInfo.getRequiredVersion())))
                     && (deferredMethodSpecified || deferredMethod
                             || deferredValueSpecified || deferredValue)) {
                 err.jspError("jsp.error.invalid.version", path);

diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java
index 4d95a3f..83e0ac4 100644 (file)
--- a/java/org/apache/jasper/compiler/Validator.java
+++ b/java/org/apache/jasper/compiler/Validator.java
@@ -706,7 +706,8 @@ class Validator {
             if (n.getType() == '#') {
                 if (!pageInfo.isDeferredSyntaxAllowedAsLiteral()
                         && (tagInfo == null 
-                                || ((tagInfo != null) && !tagInfo.getTagLibrary().getRequiredVersion().equals("2.0")))) {
+                                || ((tagInfo != null) && !(tagInfo.getTagLibrary().getRequiredVersion().equals("2.0")
+                                        || tagInfo.getTagLibrary().getRequiredVersion().equals("1.2"))))) {
                     err.jspError(n, "jsp.error.el.template.deferred");
                 } else {
                     return;
@@ -1024,7 +1025,8 @@ class Validator {
                             && (attrs.getURI(i) == null
                                     || attrs.getURI(i).length() == 0 || attrs
                                     .getURI(i).equals(n.getURI()))) {
-                        boolean checkDeferred = !tagInfo.getTagLibrary().getRequiredVersion().equals("2.0");
+                        boolean checkDeferred = !(tagInfo.getTagLibrary().getRequiredVersion().equals("2.0")
+                                || tagInfo.getTagLibrary().getRequiredVersion().equals("1.2"));
                         boolean deferred = false;
                         boolean deferredValueIsLiteral = false;
                         boolean expression = isExpression(n, attrs.getValue(i), checkDeferred);