recursive mode of copyFilesFromDirectory did not copy directories if …

…they already exist on the destination originally reported by @gavineadie
wocommunity · Dec 3, 2013 · cdb86a4 · cdb86a4
1 parent 5ffe965
commit cdb86a4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXFileUtilities.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXFileUtilities.java
@@ -1023,10 +1023,11 @@ public static void copyFilesFromDirectory(File srcDirectory,
                         if (deleteOriginals) {
                             renameTo(srcFile, dstFile);
                         } else {
-                            if (dstFile.mkdirs())
+                            if (dstFile.exists() || dstFile.mkdirs()) {
                                 copyFilesFromDirectory(srcFile, dstFile, deleteOriginals, replaceExistingFiles, recursiveCopy, filter);
-                            else
+                            } else {
                                 log.error("Error creating directories for destination \""+dstDirectory.getPath()+"\"");
+                            }
                         }
                     } else if (!srcFile.isDirectory()) {
                     	if (replaceExistingFiles || ! dstFile.exists()) {