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

diff --git a/java/org/apache/jasper/compiler/Compiler.java b/java/org/apache/jasper/compiler/Compiler.java
index 9328781..1d47ad4 100644 (file)
--- 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);
             }
         }