From c9958277baf5f911bda401802259a4b50d9cd599 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 03 Aug 2016 16:06:26 +0000
Subject: [PATCH] BasicNode: use DN
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
index e2de5f8..f28f19d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
@@ -309,7 +309,8 @@
*/
private void searchForCustomFilter(BasicNode node, ConnectionWrapper conn) throws IOException
{
- SearchRequest request = newSearchRequest(node.getDN(), WHOLE_SUBTREE, controller.getFilter(), NO_ATTRIBUTES)
+ SearchRequest request =
+ newSearchRequest(node.getDN().toString(), WHOLE_SUBTREE, controller.getFilter(), NO_ATTRIBUTES)
.setSizeLimit(1);
try (ConnectionEntryReader s = conn.getConnection().search(request))
{
@@ -398,10 +399,9 @@
String filter = controller.getObjectSearchFilter();
SearchRequest request =
- newSearchRequest(node.getDN(), BASE_OBJECT, filter, controller.getAttrsForRedSearch())
+ newSearchRequest(node.getDN().toString(), BASE_OBJECT, filter, controller.getAttrsForRedSearch())
.setSizeLimit(controller.getMaxChildren());
localEntry = conn.getConnection().searchSingleEntry(request);
- localEntry.setName(node.getDN());
if (localEntry == null) {
/* Not enough rights to read the entry or the entry simply does not exist */
throw newLdapException(ResultCode.NO_SUCH_OBJECT, "Can't find entry: " + node.getDN());
@@ -798,19 +798,10 @@
for (int i=0; i<getNode().getChildCount(); i++)
{
BasicNode node = (BasicNode)getNode().getChildAt(i);
- try
+ if (node.getDN().equals(parentToAddDN))
{
- DN dn = DN.valueOf(node.getDN());
- if (dn.equals(parentToAddDN))
- {
- resultValue[0] = false;
- break;
- }
- }
- catch (Throwable t)
- {
- throw new RuntimeException("Error decoding dn: "+
- node.getDN()+" . "+t, t);
+ resultValue[0] = false;
+ break;
}
}
}
@@ -966,9 +957,7 @@
boolean checkSucceeded = true;
try
{
- DN dn1 = DN.valueOf(getNode().getDN());
- DN dn2 = url.getBaseDN();
- if (dn2.isSuperiorOrEqualTo(dn1))
+ if (url.getBaseDN().isSuperiorOrEqualTo(getNode().getDN()))
{
HostPort urlHostPort = new HostPort(url.getHost(), url.getPort());
checkSucceeded = urlHostPort.equals(controller.getConfigurationConnection().getHostPort());
--
Gitblit v1.10.0