From 5984af9f0c6c5f852bc3292d981e0854f44ae802 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 29 Jun 2016 12:25:42 +0000
Subject: [PATCH] OPENDJ-3173 Upgrade task for new HTTP configuration model

---
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
index 14f8c68..3ede6cc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
@@ -81,7 +81,7 @@
   }
 
   /**
-   * Copies everything below the specified file.
+   * Recursively copies everything below the specified file/directory.
    *
    * @param objectFile
    *          the file to be copied.
@@ -89,16 +89,12 @@
    *          the directory to copy the file to
    * @param overwrite
    *          overwrite destination files.
-   * @return File representing the destination
    * @throws IOException
    *           if something goes wrong.
    */
-  public static File copy(File objectFile, File destDir, boolean overwrite)
-      throws IOException
+  public static void copyRecursively(File objectFile, File destDir, boolean overwrite) throws IOException
   {
-    CopyOperation co = new CopyOperation(objectFile, destDir, overwrite);
-    co.apply();
-    return co.getDestination();
+    operateRecursively(new CopyOperation(objectFile, destDir, overwrite), null);
   }
 
   private static void operateRecursively(FileOperation op, FileFilter filter)

--
Gitblit v1.10.0