From cdb86a41c517ca963cfdb6aa3094e4bd744bef4e Mon Sep 17 00:00:00 2001
From: Johann Werner <jw@oyosys.de>
Date: Tue, 3 Dec 2013 08:07:36 +0100
Subject: [PATCH] recursive mode of copyFilesFromDirectory did not copy
 directories if they already exist on the destination

originally reported by @gavineadie
---
 .../Sources/er/extensions/foundation/ERXFileUtilities.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXFileUtilities.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXFileUtilities.java
index d115b35c639..0145e40a1e1 100644
--- 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()) {