Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 72044 invoked from network); 16 Apr 2010 19:36:28 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Apr 2010 19:36:28 -0000 Received: (qmail 5006 invoked by uid 500); 16 Apr 2010 19:36:28 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 4951 invoked by uid 500); 16 Apr 2010 19:36:28 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 4922 invoked by uid 99); 16 Apr 2010 19:36:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Apr 2010 19:36:28 +0000 X-ASF-Spam-Status: No, hits=-1131.8 required=10.0 tests=ALL_TRUSTED,AWL 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; Fri, 16 Apr 2010 19:36:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4BB6323889C5; Fri, 16 Apr 2010 19:36:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r935056 - in /cxf/branches/2.2.x-fixes: ./ common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java Date: Fri, 16 Apr 2010 19:36:07 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100416193607.4BB6323889C5@eris.apache.org> Author: dkulp Date: Fri Apr 16 19:36:06 2010 New Revision: 935056 URL: http://svn.apache.org/viewvc?rev=935056&view=rev Log: Merged revisions 935054 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r935054 | dkulp | 2010-04-16 15:32:59 -0400 (Fri, 16 Apr 2010) | 1 line Don't use the static for the hook ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java?rev=935056&r1=935055&r2=935056&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java (original) +++ cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java Fri Apr 16 19:36:06 2010 @@ -76,10 +76,11 @@ public final class FileUtils { f = new File(s, "cxf-tmp-" + x); } defaultTempDir = f; + final File f2 = f; Thread hook = new Thread() { @Override public void run() { - removeDir(defaultTempDir, true); + removeDir(f2, true); } }; Runtime.getRuntime().addShutdownHook(hook);