Author: kkolinko
Date: Wed Feb 5 12:34:28 2014
New Revision: 1564746
URL: http://svn.apache.org/r1564746
Log:
Followup to r1562597
xmlBlockExternal is now true by default. It is the false value that now needs
to be passed explicitly.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1564746&r1=1564745&r2=1564746&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Wed Feb
5 12:34:28 2014
@@ -309,9 +309,7 @@ public class ApplicationContext
return "true";
}
if (Globals.JASPER_XML_BLOCK_EXTERNAL_INIT_PARAM.equals(name)) {
- if (context.getXmlBlockExternal()) {
- return "true";
- } else if (Globals.IS_SECURITY_ENABLED) {
+ if (!context.getXmlBlockExternal()) {
// System admin has explicitly changed the default
return "false";
}
@@ -333,7 +331,7 @@ public class ApplicationContext
if (context.getTldValidation()) {
names.add(Globals.JASPER_XML_VALIDATION_TLD_INIT_PARAM);
}
- if (context.getXmlBlockExternal() || Globals.IS_SECURITY_ENABLED) {
+ if (!context.getXmlBlockExternal()) {
names.add(Globals.JASPER_XML_BLOCK_EXTERNAL_INIT_PARAM);
}
return Collections.enumeration(names);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1564746&r1=1564745&r2=1564746&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Feb 5 12:34:28 2014
@@ -74,6 +74,10 @@
deployment descriptor and with annotation then the one specified in the
web deployment descriptor is with priority. (violetagg)
</fix>
+ <fix>
+ Fix passing the value of false for <code>xmlBlockExternal</code> option
+ of Context to Jasper, as the default was changed in 8.0.1. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
