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/admin/ads/ADSContextHelper.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java
index 0b245b0..da6f084 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.admin.ads;
@@ -100,20 +100,17 @@
if (backend != null)
{
SortedSet<DN> suffixes = backend.getBaseDN();
- if (suffixes != null)
+ if (suffixes != null
+ && suffixes.remove(DN.valueOf(ADSContext.getAdministrationSuffixDN())))
{
- if (suffixes.remove(
- DN.valueOf(ADSContext.getAdministrationSuffixDN())))
+ if (suffixes.size() > 0)
{
- if (suffixes.size() > 0)
- {
- backend.setBaseDN(suffixes);
- backend.commit();
- }
- else
- {
- root.removeBackend(backendName);
- }
+ backend.setBaseDN(suffixes);
+ backend.commit();
+ }
+ else
+ {
+ root.removeBackend(backendName);
}
}
}
--
Gitblit v1.10.0