Author: markt
Date: Mon Nov 25 13:55:34 2013
New Revision: 1545284
URL: http://svn.apache.org/r1545284
Log:
Fix logic error that meant that unpackWARs was ignored if a WAR failed to
deploy (since the Context is an instance of FailedContext in that case)
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1545284&r1=1545283&r2=1545284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Nov 25
13:55:34 2013
@@ -605,10 +605,11 @@ public class ContextConfig implements Li
String pathName = cn.getBaseName();
boolean unpackWARs = true;
- if (host instanceof StandardHost &&
- context instanceof StandardContext) {
- unpackWARs = ((StandardHost) host).isUnpackWARs() &&
- ((StandardContext) context).getUnpackWAR();
+ if (host instanceof StandardHost) {
+ unpackWARs = ((StandardHost) host).isUnpackWARs();
+ if (unpackWARs && context instanceof StandardContext) {
+ unpackWARs = ((StandardContext) context).getUnpackWAR();
+ }
}
if (docBase.toLowerCase(Locale.ENGLISH).endsWith(".war") &&
!file.isDirectory() && unpackWARs) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
