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

commit 3fbb4f311eb4128436e8161fbf03a03230d286f3
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Nov 14 13:28:54 2024 -0500

    It is OK to call java.io.File.listFiles(FileFilter) with a null argument
    
    See the Javadoc
---
 src/main/java/org/apache/commons/io/DirectoryWalker.java | 2 +-
 src/main/java/org/apache/commons/io/FileUtils.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/io/DirectoryWalker.java 
b/src/main/java/org/apache/commons/io/DirectoryWalker.java
index e8a4a2e24..62298a50c 100644
--- a/src/main/java/org/apache/commons/io/DirectoryWalker.java
+++ b/src/main/java/org/apache/commons/io/DirectoryWalker.java
@@ -644,7 +644,7 @@ public abstract class DirectoryWalker<T> {
             final int childDepth = depth + 1;
             if (depthLimit < 0 || childDepth <= depthLimit) {
                 checkIfCancelled(directory, depth, results);
-                File[] childFiles = filter == null ? directory.listFiles() : 
directory.listFiles(filter);
+                File[] childFiles = directory.listFiles(filter);
                 childFiles = filterDirectoryContents(directory, depth, 
childFiles);
                 if (childFiles == null) {
                     handleRestricted(directory, childDepth, results);
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java 
b/src/main/java/org/apache/commons/io/FileUtils.java
index 9b5bcd0b3..d9ce9a3e7 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -2306,7 +2306,7 @@ public class FileUtils {
      */
     private static File[] listFiles(final File directory, final FileFilter 
fileFilter) throws IOException {
         requireDirectoryExists(directory, "directory");
-        final File[] files = fileFilter == null ? directory.listFiles() : 
directory.listFiles(fileFilter);
+        final File[] files = directory.listFiles(fileFilter);
         if (files == null) {
             // null if the directory does not denote a directory, or if an I/O 
error occurs.
             throw new IOException("Unknown I/O error listing contents of 
directory: " + directory);

Reply via email to