On 06/03/2014 08:46, Konstantin Kolinko wrote: > 2014-03-06 11:40 GMT+04:00 <ma...@apache.org>: >> Author: markt >> Date: Thu Mar 6 07:40:12 2014 >> New Revision: 1574785 >> >> URL: http://svn.apache.org/r1574785 >> Log: >> Better fix for BZ56199 >> Fix failing unit tests caused by original fix. >> >> Modified: >> tomcat/trunk/java/org/apache/jasper/JspC.java >> tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java >> tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java >> >> Modified: tomcat/trunk/java/org/apache/jasper/JspC.java >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1574785&r1=1574784&r2=1574785&view=diff >> ============================================================================== >> --- tomcat/trunk/java/org/apache/jasper/JspC.java (original) >> +++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Mar 6 07:40:12 2014 >> @@ -1463,17 +1463,11 @@ public class JspC extends Task implement >> PrintWriter log = new PrintWriter(System.out); >> URL resourceBase = new >> File(uriRoot).getCanonicalFile().toURI().toURL(); >> >> - context = new JspCServletContext(log, resourceBase, classLoader); >> + context = new JspCServletContext(log, resourceBase, classLoader, >> + isValidateXml(), isBlockExternal()); >> if (isValidateTld()) { >> >> context.setInitParameter(Constants.XML_VALIDATION_TLD_INIT_PARAM, "true"); >> } >> - if (isValidateXml()) { >> - context.setInitParameter(Constants.XML_VALIDATION_INIT_PARAM, >> "true"); >> - } >> - context.setInitParameter(Constants.XML_BLOCK_EXTERNAL_INIT_PARAM, >> - String.valueOf(isBlockExternal())); > > > Aren't there classes in Jasper that are reading > Constants.XML_BLOCK_EXTERNAL_INIT_PARAM > init parameter. With this change it is not set any more. > > Though setting it can be moved into JspCServletContext constructor.
Yes. I'll get that fixed. The XML validation constant can be removed though. It is no longer used. Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
