From 85f08bac6d325edb495f4be8ed4cc10a1b721f4a Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Sat, 28 Mar 2009 12:58:55 +0000
Subject: [PATCH] Fix for issue 2793 (backup incremental : unexpected behavior when specifying empty directory)
---
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java | 16 ++++++++++++++--
opendj-sdk/opends/src/messages/messages/tools.properties | 2 +-
opendj-sdk/opends/src/messages/messages/jeb.properties | 5 +++--
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/jeb.properties b/opendj-sdk/opends/src/messages/messages/jeb.properties
index a21503e..e915037 100644
--- a/opendj-sdk/opends/src/messages/messages/jeb.properties
+++ b/opendj-sdk/opends/src/messages/messages/jeb.properties
@@ -20,7 +20,7 @@
#
# CDDL HEADER END
#
-# Copyright 2006-2008 Sun Microsystems, Inc.
+# Copyright 2006-2009 Sun Microsystems, Inc.
@@ -354,4 +354,5 @@
%d nodes evicted: %d BIN nodes stripped: %d
NOTICE_JEB_IMPORT_LDIF_EVICTION_DETECTED_190=Eviction detected after importing \
%d entries
-
+MILD_WARN_BACKUPDB_INCREMENTAL_NOT_FOUND_DOING_NORMAL_191=Could not find any \
+ backup in '%s'. A full backup will be executed
diff --git a/opendj-sdk/opends/src/messages/messages/tools.properties b/opendj-sdk/opends/src/messages/messages/tools.properties
index b3d7a8e..f4b3e3d 100644
--- a/opendj-sdk/opends/src/messages/messages/tools.properties
+++ b/opendj-sdk/opends/src/messages/messages/tools.properties
@@ -2466,4 +2466,4 @@
SEVERE_ERR_LDAPCOMPARE_ERROR_READING_FILE_1668=An error occurred reading file \
'%s'. Check that the file exists and that you have read access rights to \
- it. Details: %s
\ No newline at end of file
+ it. Details: %s
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
index fb8bc21..a1cf3da 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.backends.jeb;
import org.opends.messages.Message;
@@ -269,7 +269,19 @@
}
*/
- baseBackup = getBackupInfo(backupDir, incrBaseID);
+ if (incrBaseID == null)
+ {
+ // No incremental backup ID: log a message informing that a backup
+ // could not be found and that a normal backup will be done.
+ incremental = false;
+ Message message = WARN_BACKUPDB_INCREMENTAL_NOT_FOUND_DOING_NORMAL.get(
+ backupDir.getPath());
+ logError(message);
+ }
+ else
+ {
+ baseBackup = getBackupInfo(backupDir, incrBaseID);
+ }
}
// Get information about the latest log file from the base backup.
--
Gitblit v1.10.0