IO-276 "FileUtils#deleteDirectoryOnExit(File)" does not work

sebbASF · sebbASF · commit 4cef5296135c · 2012-03-01T17:18:00.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1295683 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -40,6 +40,9 @@ The <action> type attribute can be add,update,fix,remove.
 
   <body>
     <release version="2.2" date="TBA">
+      <action dev="sebb" type="fix" issue="IO-276" due-to="nkami">
+        "FileUtils#deleteDirectoryOnExit(File)" does not work
+      </action>        
       <action dev="sebb" type="fix" issue="IO-273" due-to="sebb">
         BoundedInputStream.read() treats max differently from BoundedInputStream.read(byte[]...)
       </action>        
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -2061,10 +2061,10 @@ private static void deleteDirectoryOnExit(File directory) throws IOException {
             return;
         }
 
+        directory.deleteOnExit();
         if (!isSymlink(directory)) {
             cleanDirectoryOnExit(directory);
         }
-        directory.deleteOnExit();
     }
 
     /**
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
@@ -2254,6 +2254,15 @@ public void testMoveToDirectory_Errors() throws Exception {
         }
     }
 
+    public void testIO276() throws Exception {
+        File dir = new File("target", "IO276");
+        assertTrue(dir+" should not be present",dir.mkdirs());
+        File file = new File(dir,"IO276.txt");
+        assertTrue(file+" should not be present",file.createNewFile());
+        FileUtils.forceDeleteOnExit(dir); 
+        // If this does not work, test will fail next time (assuming target is not cleaned)
+    }
+
     /**
      * DirectoryWalker implementation that recursively lists all files and directories.
      */

Original file line number	Diff line number	Diff line change
`@@ -2061,10 +2061,10 @@ private static void deleteDirectoryOnExit(File directory) throws IOException {`
`2061`	`2061`	`return;`
`2062`	`2062`	`}`
`2063`	`2063`
	`2064`	`+ directory.deleteOnExit();`
`2064`	`2065`	`if (!isSymlink(directory)) {`
`2065`	`2066`	`cleanDirectoryOnExit(directory);`
`2066`	`2067`	`}`
`2067`		`- directory.deleteOnExit();`
`2068`	`2068`	`}`
`2069`	`2069`
`2070`	`2070`	`/**`