Author: kkolinko Date: Tue Mar 9 00:43:23 2010 New Revision: 920596 URL: http://svn.apache.org/viewvc?rev=920596&view=rev Log: 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).
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=920596&r1=920595&r2=920596&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Tue Mar 9 00:43:23 2010 @@ -152,18 +152,19 @@ 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); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org