This is an automated email from the ASF dual-hosted git repository.

bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git


The following commit(s) were added to refs/heads/master by this push:
     new ef43074  user rmdir to delete temp directory added with #90
ef43074 is described below

commit ef43074d7b95c0a43d0f5b8d05d562947b0c2fba
Author: Stefan Bodewig <[email protected]>
AuthorDate: Tue Jan 21 18:45:32 2020 +0100

    user rmdir to delete temp directory added with #90
---
 .../compress/archivers/zip/Zip64SupportIT.java     | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git 
a/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java 
b/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
index bc9cdf2..455125c 100644
--- 
a/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
+++ 
b/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java
@@ -35,6 +35,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
+import java.nio.file.Files;
 import java.util.Enumeration;
 import java.util.Random;
 import java.util.zip.ZipEntry;
@@ -2437,9 +2438,7 @@ public class Zip64SupportIT {
         File f = getTempFile(testName);
         File dir = null;
         if (splitSize != null) {
-            dir = File.createTempFile("commons-compress-" + testName, "");
-            dir.delete();
-            dir.mkdir();
+            dir = Files.createTempDirectory("commons-compress-" + 
testName).toFile();
             dir.deleteOnExit();
 
             f = new File(dir, "commons-compress-" + testName + ".zip");
@@ -2462,17 +2461,17 @@ public class Zip64SupportIT {
         } finally {
             try {
                 zos.destroy();
-                if (dir != null) {
-                    for (File file : dir.listFiles()) {
-                        file.delete();
-                    }
-                    dir.delete();
-                }
             } finally {
-                if (os != null) {
-                    os.close();
+                try {
+                    if (os != null) {
+                        os.close();
+                    }
+                    AbstractTestCase.tryHardToDelete(f);
+                } finally {
+                    if (dir != null) {
+                        AbstractTestCase.rmdir(dir);
+                    }
                 }
-                AbstractTestCase.tryHardToDelete(f);
             }
         }
     }

Reply via email to