From 0e63575f95dafe1cdb67fb1cc3814ac97e51596e Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 19 Sep 2014 15:36:37 +0000
Subject: [PATCH] OPENDJ-1388 CR-3446 Implement simple changelog db based on single log file
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
index ee6aa1e..f37011d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
@@ -26,10 +26,10 @@
*/
package org.opends.server.backends.jeb;
import org.forgerock.i18n.LocalizableMessage;
-
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.util.DynamicConstants;
+import org.opends.server.util.StaticUtils;
import org.opends.server.types.CryptoManagerException;
import javax.crypto.Mac;
@@ -58,8 +58,6 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* A backup manager for JE backends.
*/
@@ -657,8 +655,7 @@
// Delete the current backend directory and rename the restore directory.
if (!verifyOnly)
{
- cleanup(backendDir);
- backendDir.delete();
+ StaticUtils.recursiveDelete(backendDir);
if (!restoreDir.renameTo(backendDir))
{
LocalizableMessage msg = ERR_JEB_CANNOT_RENAME_RESTORE_DIRECTORY.get(
--
Gitblit v1.10.0