From ca669ae54f86dbeea277280690584d9f591c7571 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Feb 2015 07:26:26 +0000
Subject: [PATCH] AutoRefactor: collapse if statements
---
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackupManager.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackupManager.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackupManager.java
index ec74caa..cc8d01e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackupManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackupManager.java
@@ -204,13 +204,10 @@
if (incremental)
{
- if (incrBaseID == null)
+ if (incrBaseID == null && backupDir.getLatestBackup() != null)
{
// The default is to use the latest backup as base.
- if (backupDir.getLatestBackup() != null)
- {
- incrBaseID = backupDir.getLatestBackup().getBackupID();
- }
+ incrBaseID = backupDir.getLatestBackup().getBackupID();
}
if (incrBaseID == null)
@@ -906,12 +903,10 @@
// See if we need to restore the file.
File file = new File(restoreDir, name);
OutputStream outputStream = null;
- if (includeFiles == null || includeFiles.contains(zipEntry.getName()))
+ if ((includeFiles == null || includeFiles.contains(zipEntry.getName()))
+ && !verifyOnly)
{
- if (!verifyOnly)
- {
- outputStream = new FileOutputStream(file);
- }
+ outputStream = new FileOutputStream(file);
}
if (outputStream != null || mac != null || digest != null)
@@ -972,14 +967,10 @@
zipStream.close();
// Check the hash.
- if (digest != null)
+ if (digest != null && !Arrays.equals(digest.digest(), hash))
{
- if (!Arrays.equals(digest.digest(), hash))
- {
- LocalizableMessage message = ERR_JEB_BACKUP_UNSIGNED_HASH_ERROR.get(backupID);
- throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message);
- }
+ LocalizableMessage message = ERR_JEB_BACKUP_UNSIGNED_HASH_ERROR.get(backupID);
+ throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
}
if (mac != null)
--
Gitblit v1.10.0