Repository: commons-io Updated Branches: refs/heads/master d24dd1a3a -> 71fc2c4c8
[IO-571] Remove redundant isDirectory() check in org.apache.commons.io.FileUtils.listFilesAndDirs(File, IOFileFilter, IOFileFilter). Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/71fc2c4c Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/71fc2c4c Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/71fc2c4c Branch: refs/heads/master Commit: 71fc2c4c817a8c9bb41650d5b27a89e207a68c39 Parents: d24dd1a Author: Gary Gregory <[email protected]> Authored: Thu Mar 8 12:52:41 2018 -0700 Committer: Gary Gregory <[email protected]> Committed: Thu Mar 8 12:52:41 2018 -0700 ---------------------------------------------------------------------- src/changes/changes.xml | 3 +++ src/main/java/org/apache/commons/io/FileUtils.java | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-io/blob/71fc2c4c/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index a65f3bd..81de24e 100644 --- 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."> http://git-wip-us.apache.org/repos/asf/commons-io/blob/71fc2c4c/src/main/java/org/apache/commons/io/FileUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/FileUtils.java b/src/main/java/org/apache/commons/io/FileUtils.java index 0049cbc..3dfb24e 100644 --- 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 class FileUtils { //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;
