Author: kfujino
Date: Tue Jul 23 08:31:09 2013
New Revision: 1505929
URL: http://svn.apache.org/r1505929
Log:
Context's copyXML should not affect copyXML of other contexts.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1505929&r1=1505928&r2=1505929&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Jul 23
08:31:09 2013
@@ -1100,12 +1100,13 @@ public class HostConfig
}
}
- if (copyXML == false && context instanceof StandardContext) {
+ boolean copyThisXml = copyXML;
+ if (copyThisXml == false && context instanceof
StandardContext) {
// Host is using default value. Context may override it.
- copyXML = ((StandardContext) context).getCopyXML();
+ copyThisXml = ((StandardContext) context).getCopyXML();
}
- if (copyXML) {
+ if (copyThisXml) {
InputStream is = null;
OutputStream os = null;
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
