From e4aeb9ec623c112c2fa1b6a60e15ac7482ecca70 Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Thu, 22 Jan 2015 17:06:14 +0000
Subject: [PATCH] OPENDJ-1752 (CR-5857) Remove backup fails
---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java | 4 +++-
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackupManager.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
index dd6490f..e3f2367 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
@@ -696,6 +696,9 @@
String backupID)
throws DirectoryException
{
+ // Keep information about backup to be deleted for file removal
+ BackupInfo backupInfo = getBackupInfo(backupDir, backupID);
+
try
{
backupDir.removeBackup(backupID);
@@ -722,7 +725,6 @@
}
// Remove the archive file.
- BackupInfo backupInfo = getBackupInfo(backupDir, backupID);
File archiveFile = getArchiveFile(backupDir, backupInfo);
archiveFile.delete();
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackupManager.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackupManager.java
index ad28264..3c079e5 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackupManager.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/BackupManager.java
@@ -696,6 +696,9 @@
String backupID)
throws DirectoryException
{
+ // Keep information about backup to be deleted for file removal
+ BackupInfo backupInfo = getBackupInfo(backupDir, backupID);
+
try
{
backupDir.removeBackup(backupID);
@@ -722,7 +725,6 @@
}
// Remove the archive file.
- BackupInfo backupInfo = getBackupInfo(backupDir, backupID);
File archiveFile = getArchiveFile(backupDir, backupInfo);
archiveFile.delete();
--
Gitblit v1.10.0