Author: markt
Date: Tue Mar 3 11:52:45 2015
New Revision: 1663676
URL: http://svn.apache.org/r1663676
Log:
Only use the context.xml from an unpacked directory for a WAR if unpackWARs is
true
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=1663676&r1=1663675&r2=1663676&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Mar 3
11:52:45 2015
@@ -791,7 +791,7 @@ public class HostConfig
Context context = null;
try {
- if (deployXML && xml.exists() && !copyXML) {
+ if (deployXML && xml.exists() && unpackWARs && !copyXML) {
synchronized (digesterLock) {
try {
context = (Context) digester.parse(xml);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
