From scm-return-47340-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Fri Sep 16 18:06:20 2011 Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AFF2B7D14 for ; Fri, 16 Sep 2011 18:06:20 +0000 (UTC) Received: (qmail 66051 invoked by uid 500); 16 Sep 2011 18:06:20 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 66008 invoked by uid 500); 16 Sep 2011 18:06:20 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 66001 invoked by uid 99); 16 Sep 2011 18:06:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Sep 2011 18:06:20 +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; Fri, 16 Sep 2011 18:06:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 605542388847; Fri, 16 Sep 2011 18:05:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1171698 - /geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java Date: Fri, 16 Sep 2011 18:05:59 -0000 To: scm@geronimo.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110916180559.605542388847@eris.apache.org> Author: dblevins Date: Fri Sep 16 18:05:58 2011 New Revision: 1171698 URL: http://svn.apache.org/viewvc?rev=1171698&view=rev Log: Re-adding https://issues.apache.org/jira/browse/GERONIMO-5888 Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java?rev=1171698&r1=1171697&r2=1171698&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/FileUtils.java Fri Sep 16 18:05:58 2011 @@ -29,6 +29,7 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.net.MalformedURLException; import java.net.URL; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; @@ -111,6 +112,7 @@ public class FileUtils { File tempDir = File.createTempFile(DEFAULT_TEMP_PREFIX, DEFAULT_TEMP_DIRECTORY_SUFFIX); tempDir.delete(); tempDir.mkdirs(); + deleteOnExit(tempDir); addTempFile(tempDir); return tempDir; } @@ -448,4 +450,37 @@ public class FileUtils { private FileUtils() { } + + static final List delete = new ArrayList(); + + private static void deleteOnExit(File file) { + delete.add(file.getAbsolutePath()); + } + + private static void delete() { + for (String path : delete) { + delete(new File(path)); + } + } + + private static void delete(File file) { + if (file.isDirectory()) { + for (File f : file.listFiles()) { + delete(f); + } + } + + file.delete(); + } + + // Shutdown hook for recurssive delete on tmp directories + + static { + Runtime.getRuntime().addShutdownHook(new Thread(){ + @Override + public void run() { + delete(); + } + }); + } }