svn commit: r760664 - /ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java

[midon]

Author: midon
Date: Tue Mar 31 21:36:36 2009
New Revision: 760664

URL: http://svn.apache.org/viewvc?rev=760664&view=rev
Log:
do not add subdirectories twice

Modified:
    
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java

Modified: 
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java?rev=760664&r1=760663&r2=760664&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/fs/FileUtils.java
 Tue Mar 31 21:36:36 2009
@@ -145,12 +145,12 @@
             for (int numFiles = files.length, i = 0; i < numFiles; i++) {
                 File currentFile = files[i];
 
-                if ((filter == null) || ((filter != null) && 
(filter.accept(currentFile)))) {
-                    collectedFiles.add(currentFile);
-                }
-
                 if (currentFile.isDirectory()) {
                     FileUtils.directoryEntriesInPath(collectedFiles, 
currentFile, filter);
+                } else {
+                    if ((filter == null) || ((filter != null) && 
(filter.accept(currentFile)))) {
+                        collectedFiles.add(currentFile);
+                    }
                 }
             }
         }
@@ -159,4 +159,9 @@
     public static String encodePath(String path) {
         return path.replaceAll(" ", "%20");
     }
+
+    public static void main(String[] args) {
+        List<File> l = directoryEntriesInPath(new File("/tmp/test"));
+        for(File f : l) System.out.println(f);
+    }
 }