Author: markt Date: Wed Dec 21 19:25:43 2011 New Revision: 1221842 URL: http://svn.apache.org/viewvc?rev=1221842&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52293 Correctly handle Context.antiResourceLocking when HOst.unpackWARs=false
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=1221842&r1=1221841&r2=1221842&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Dec 21 19:25:43 2011 @@ -742,8 +742,7 @@ public class ContextConfig docBase = cn.getBaseName(); File file = null; - if (docBase.toLowerCase(Locale.ENGLISH).endsWith(".war")) { - // TODO - This is never executed. Bug or code to delete? + if (originalDocBase.toLowerCase(Locale.ENGLISH).endsWith(".war")) { file = new File(System.getProperty("java.io.tmpdir"), deploymentCount++ + "-" + docBase + ".war"); } else { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org