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/guitools/controlpanel/ui/NewBaseDNPanel.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index 4994d5d..49514fc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -564,15 +564,13 @@
break;
}
}
- else if (theDN.isAncestorOf(baseDN.getDn()))
+ else if (theDN.isAncestorOf(baseDN.getDn())
+ && backendName.equalsIgnoreCase(backend.getBackendID()))
{
- if (backendName.equalsIgnoreCase(backend.getBackendID()))
- {
- errors.add(ERR_BASE_DN_DN_IS_ANCESTOR_OF.get(baseDN.getDn()));
- setPrimaryInvalid(lDirectoryBaseDN);
- baseDNAlreadyDefined = true;
- break;
- }
+ errors.add(ERR_BASE_DN_DN_IS_ANCESTOR_OF.get(baseDN.getDn()));
+ setPrimaryInvalid(lDirectoryBaseDN);
+ baseDNAlreadyDefined = true;
+ break;
}
}
if (baseDNAlreadyDefined)
--
Gitblit v1.10.0