From b648c16d018b804afebe10d55a3cbcdc49097ee3 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)
---
opends/src/server/org/opends/server/backends/jeb/BackupManager.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/BackupManager.java b/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
index fb8bc21..a1cf3da 100644
--- a/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
+++ b/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