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/ConfigureDS.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
index fc0c83b..d4dc5da 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
@@ -732,16 +732,12 @@
}
// Check that the keystore path values are valid.
- if (keyManagerPath.isPresent())
+ if (keyManagerPath.isPresent() && !keyManagerProviderDN.isPresent())
{
- if (!keyManagerProviderDN.isPresent())
- {
- LocalizableMessage message = ERR_CONFIGDS_KEYMANAGER_PROVIDER_DN_REQUIRED.get(
- keyManagerProviderDN.getLongIdentifier(),
- keyManagerPath.getLongIdentifier());
- err.println(wrapText(message, MAX_LINE_WIDTH));
- return 1;
- }
+ LocalizableMessage message = ERR_CONFIGDS_KEYMANAGER_PROVIDER_DN_REQUIRED.get(
+ keyManagerProviderDN.getLongIdentifier(), keyManagerPath.getLongIdentifier());
+ err.println(wrapText(message, MAX_LINE_WIDTH));
+ return 1;
}
// If one or more base DNs were specified, then update the config
--
Gitblit v1.10.0