IO-328 FileUtils.listFilesAndDirs includes original dir in results even when it doesn't match filter

sebbASF · sebbASF · commit e84d32281523 · 2013-04-21T23:26:47.000Z
Javadoc: clarify that original dir is included in the results git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1470362 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -47,6 +47,10 @@ The <action> type attribute can be add,update,fix,remove.
   <body>
     <!-- The release date is the date RC is cut -->
     <release version="2.5" date="2013-??-??" description="New features and bug fixes.">    
+      <action issue="IO-328" dev="sebb" type="update">
+        FileUtils.listFilesAndDirs includes original dir in results even when it doesn't match filter
+        Javadoc: clarify that original dir is included in the results
+      </action>            
       <action issue="IO-330" dev="sebb" type="add">
          IOUtils#toBufferedOutputStream/toBufferedWriter to conditionally wrap the output
          Added asBufferedInputStream, asBufferedOutputStream, asBufferedReader, asBufferedWriter 
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -574,7 +574,8 @@ private static IOFileFilter setUpEffectiveDirFilter(final IOFileFilter dirFilter
      * Finds files within a given directory (and optionally its
      * subdirectories). All files found are filtered by an IOFileFilter.
      * <p>
-     * The resulting collection includes the subdirectories themselves.
+     * The resulting collection includes the starting directory and 
+     * any subdirectories that match the directory filter.
      * <p>
      * @see org.apache.commons.io.FileUtils#listFiles  
      *
