From 68abf38e0b76422555852f16d5931f429dc74561 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 07 Mar 2016 15:04:03 +0000
Subject: [PATCH] OPENDJ-1342 Migrate AVA, RDN, and DN classes: replaced calls to DN.rdn(int) and DN(RDN[])
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 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 d0d1b91..82b0cb7 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
@@ -33,16 +33,16 @@
import javax.swing.SwingUtilities;
import javax.swing.tree.TreeNode;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.RDN;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
import org.opends.messages.AdminToolMessages;
import org.opends.server.schema.SchemaConstants;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.LDAPURL;
import org.opends.server.types.OpenDsException;
-import org.forgerock.opendj.ldap.RDN;
/**
* The class that is in charge of doing the LDAP searches required to update a
@@ -796,30 +796,8 @@
// if it is the case, do not add the parent. If is not the case,
// search for the parent and add it.
RDN[] rdns = new RDN[parentComponents + 1];
- int diff = dn.size() - rdns.length;
- for (int i=0; i < rdns.length; i++)
- {
- rdns[i] = dn.rdn(i + diff);
- }
- final DN parentToAddDN = new DN(rdns);
- boolean mustAddParent = true;
- for (SearchResult addedEntry : childEntries)
- {
- try
- {
- DN addedDN = DN.valueOf(addedEntry.getName());
- if (addedDN.equals(parentToAddDN))
- {
- mustAddParent = false;
- break;
- }
- }
- catch (Throwable t)
- {
- throw new RuntimeException("Error decoding dn: "+
- addedEntry.getName()+" . "+t, t);
- }
- }
+ final DN parentToAddDN = dn.parent(dn.size() - rdns.length);
+ boolean mustAddParent = mustAddParent(parentToAddDN);
if (mustAddParent)
{
final boolean resultValue[] = {true};
@@ -903,6 +881,26 @@
}
}
+ private boolean mustAddParent(final DN parentToAddDN)
+ {
+ for (SearchResult addedEntry : childEntries)
+ {
+ try
+ {
+ DN addedDN = DN.valueOf(addedEntry.getName());
+ if (addedDN.equals(parentToAddDN))
+ {
+ return false;
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new RuntimeException("Error decoding dn: " + addedEntry.getName() + " . " + t, t);
+ }
+ }
+ return true;
+ }
+
/**
* Returns the entry for the given dn.
* The code assumes that the request controls are set in the connection.
--
Gitblit v1.10.0