Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 30DB9792E for ; Wed, 21 Dec 2011 19:26:06 +0000 (UTC) Received: (qmail 49587 invoked by uid 500); 21 Dec 2011 19:26:05 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 49533 invoked by uid 500); 21 Dec 2011 19:26:05 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 49524 invoked by uid 99); 21 Dec 2011 19:26:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Dec 2011 19:26:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Dec 2011 19:26:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E3FCF23889B3 for ; Wed, 21 Dec 2011 19:25:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1221842 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Date: Wed, 21 Dec 2011 19:25:43 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111221192543.E3FCF23889B3@eris.apache.org> 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-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org