[commons-io] branch master updated: Reuse IOExceptionList and fix checkstyle unused imports.

[ggregory]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 7ec3387  Reuse IOExceptionList and fix checkstyle unused imports.
7ec3387 is described below

commit 7ec3387d223d696623d8fef222c633b5adfb9e4c
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Fri Aug 14 23:02:15 2020 -0400

    Reuse IOExceptionList and fix checkstyle unused imports.
---
 src/main/java/org/apache/commons/io/FileUtils.java | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/commons/io/FileUtils.java 
b/src/main/java/org/apache/commons/io/FileUtils.java
index c9954ad..1d1fbe1 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -49,7 +49,6 @@ import java.util.zip.Checksum;
 
 import org.apache.commons.io.file.Counters;
 import org.apache.commons.io.file.PathUtils;
-import org.apache.commons.io.file.StandardDeleteOption;
 import org.apache.commons.io.filefilter.DirectoryFileFilter;
 import org.apache.commons.io.filefilter.FalseFileFilter;
 import org.apache.commons.io.filefilter.FileFilterUtils;
@@ -331,17 +330,17 @@ public class FileUtils {
     public static void cleanDirectory(final File directory) throws IOException 
{
         final File[] files = verifiedListFiles(directory);
 
-        IOException exception = null;
+        final List<Exception> causeList = new ArrayList<>();
         for (final File file : files) {
             try {
                 forceDelete(file);
             } catch (final IOException ioe) {
-                exception = ioe;
+                causeList.add(ioe);
             }
         }
 
-        if (null != exception) {
-            throw exception;
+        if (!causeList.isEmpty()) {
+            throw new IOExceptionList(causeList);
         }
     }
 
@@ -356,17 +355,17 @@ public class FileUtils {
     private static void cleanDirectoryOnExit(final File directory) throws 
IOException {
         final File[] files = verifiedListFiles(directory);
 
-        IOException exception = null;
+        final List<Exception> causeList = new ArrayList<>();
         for (final File file : files) {
             try {
                 forceDeleteOnExit(file);
             } catch (final IOException ioe) {
-                exception = ioe;
+                causeList.add(ioe);
             }
         }
 
-        if (null != exception) {
-            throw exception;
+        if (!causeList.isEmpty()) {
+            throw new IOExceptionList(causeList);
         }
     }