From 867e35d3947bd5f2e6c0baaf502312ca618a00ea Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 18:35:35 +0000
Subject: [PATCH] Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
index 81cc654..d201ebf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
@@ -62,7 +62,6 @@
import org.opends.guitools.controlpanel.ui.nodes.SuffixNode;
import org.opends.guitools.controlpanel.ui.renderer.BrowserCellRenderer;
import org.opends.guitools.controlpanel.util.NumSubordinateHacker;
-import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.config.ConfigConstants;
import org.opends.server.types.HostPort;
import org.opends.server.types.LDAPURL;
@@ -914,15 +913,14 @@
if (node instanceof SuffixNode)
{
DN dn = node.getDN();
- String dnStr = dn.toString();
- return dn.equals(ADSContext.getAdministrationSuffixDN()) ||
- Utilities.areDnsEqual(dnStr, ConfigConstants.DN_DEFAULT_SCHEMA_ROOT) ||
- Utilities.areDnsEqual(dnStr, ConfigConstants.DN_TASK_ROOT) ||
- Utilities.areDnsEqual(dnStr, ConfigConstants.DN_CONFIG_ROOT) ||
- Utilities.areDnsEqual(dnStr, ConfigConstants.DN_MONITOR_ROOT) ||
- Utilities.areDnsEqual(dnStr, ConfigConstants.DN_TRUST_STORE_ROOT) ||
- Utilities.areDnsEqual(dnStr, ConfigConstants.DN_BACKUP_ROOT) ||
- Utilities.areDnsEqual(dnStr, DN_EXTERNAL_CHANGELOG_ROOT);
+ return dn.equals(ADSContext.getAdministrationSuffixDN())
+ || dn.equals(DN.valueOf(ConfigConstants.DN_DEFAULT_SCHEMA_ROOT))
+ || dn.equals(DN.valueOf(ConfigConstants.DN_TASK_ROOT))
+ || dn.equals(DN.valueOf(ConfigConstants.DN_CONFIG_ROOT))
+ || dn.equals(DN.valueOf(ConfigConstants.DN_MONITOR_ROOT))
+ || dn.equals(DN.valueOf(ConfigConstants.DN_TRUST_STORE_ROOT))
+ || dn.equals(DN.valueOf(ConfigConstants.DN_BACKUP_ROOT))
+ || dn.equals(DN.valueOf(DN_EXTERNAL_CHANGELOG_ROOT));
}
else
{
--
Gitblit v1.10.0