From 6fb7c57dc0d49ad27077136450920237f4c293d1 Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 9 Mar 2010 00:43:23 +0000
Subject: [PATCH] Amendment for BZ 48668 fixes. Use setter methods that accept
 String value to set pageInfo properties. Throw an exception if tagInfo is not
 available for a tag file or requiredVersion is not parseable. (Both of that
 should not happen).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@920596 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/jasper/compiler/Compiler.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Compiler.java b/java/org/apache/jasper/compiler/Compiler.java
index 93287814b..1d47ad404 100644
--- a/java/org/apache/jasper/compiler/Compiler.java
+++ b/java/org/apache/jasper/compiler/Compiler.java
@@ -152,18 +152,19 @@ public abstract class Compiler {
                     JspUtil.booleanValue(
                             jspProperty.isErrorOnUndeclaredNamespace()));
         }
-        if (ctxt.getTagInfo() != null) {
+        if (ctxt.isTagFile()) {
             try {
                 double libraryVersion = Double.parseDouble(ctxt.getTagInfo()
                         .getTagLibrary().getRequiredVersion());
                 if (libraryVersion < 2.0) {
-                    pageInfo.setELIgnored(true);
+                    pageInfo.setIsELIgnored("true", null, errDispatcher, true);
                 }
                 if (libraryVersion < 2.1) {
-                    pageInfo.setDeferredSyntaxAllowedAsLiteral(true);
+                    pageInfo.setDeferredSyntaxAllowedAsLiteral("true", null,
+                            errDispatcher, true);
                 }
             } catch (NumberFormatException ex) {
-                // ignored
+                errDispatcher.jspError(ex);
             }
         }
 
-- 
2.11.0