[IO-571] Remove redundant isDirectory() check in

org.apache.commons.io.FileUtils.listFilesAndDirs(File, IOFileFilter, IOFileFilter).
fhx1636 · Mar 8, 2018 · 71fc2c4 · 71fc2c4
1 parent d24dd1a
commit 71fc2c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -56,6 +56,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action issue="IO-570" dev="ggregory" type="fix" due-to="Pranet Verma">
         Missing Javadoc in FilenameUtils causing Travis-CI build to fail.
       </action>
+      <action issue="IO-571" dev="ggregory" type="fix" due-to="pranet">
+        Remove redundant isDirectory() check in org.apache.commons.io.FileUtils.listFilesAndDirs(File, IOFileFilter, IOFileFilter).
+      </action>
     </release>
 
     <release version="2.6" date="2017-10-15" description="Java 7 required, Java 9 supported.">

diff --git a/src/main/java/org/apache/commons/io/FileUtils.java b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -593,9 +593,7 @@ public static Collection<File> listFilesAndDirs(
 
         //Find files
         final Collection<File> files = new java.util.LinkedList<>();
-        if (directory.isDirectory()) {
-            files.add(directory);
-        }
+        files.add(directory);
         innerListFiles(files, directory,
                 FileFilterUtils.or(effFileFilter, effDirFilter), true);
         return files;