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/tools/BackUpDB.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
index 61b9cd6..e3b6b18 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java
@@ -376,18 +376,15 @@
// If the incremental base ID was specified, then make sure it is an
// incremental backup.
- if (incrementalBaseID.isPresent())
+ if (incrementalBaseID.isPresent() && ! incremental.isPresent())
{
- if (! incremental.isPresent())
- {
- LocalizableMessage message =
- ERR_BACKUPDB_INCREMENTAL_BASE_REQUIRES_INCREMENTAL.get(
- incrementalBaseID.getLongIdentifier(),
- incremental.getLongIdentifier());
- err.println(wrapText(message, MAX_LINE_WIDTH));
- err.println(argParser.getUsage());
- return 1;
- }
+ LocalizableMessage message =
+ ERR_BACKUPDB_INCREMENTAL_BASE_REQUIRES_INCREMENTAL.get(
+ incrementalBaseID.getLongIdentifier(),
+ incremental.getLongIdentifier());
+ err.println(wrapText(message, MAX_LINE_WIDTH));
+ err.println(argParser.getUsage());
+ return 1;
}
// Encryption or signing requires the ADS backend be available for
--
Gitblit v1.10.0