From f3f9f37cd05c81867e2852746b169132d8f1b598 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 01 Jul 2016 14:30:12 +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/task/ModifyEntryTask.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
index 39dc729..fe6753a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -32,7 +32,6 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.DirContext;
import javax.naming.directory.ModificationItem;
-import javax.naming.ldap.InitialLdapContext;
import javax.swing.SwingUtilities;
import javax.swing.tree.TreePath;
@@ -43,6 +42,7 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.RDN;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.guitools.controlpanel.browser.BrowserController;
import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
@@ -205,7 +205,7 @@
try
{
BasicNode node = (BasicNode)treePath.getLastPathComponent();
- InitialLdapContext ctx = controller.findConnectionForDisplayedEntry(node);
+ ConnectionWrapper conn = controller.findConnectionForDisplayedEntry(node);
useAdminCtx = controller.isConfigurationNode(node);
if (!mustRename)
{
@@ -228,7 +228,7 @@
}
});
- ctx.modifyAttributes(Utilities.getJNDIName(oldEntry.getDN()), mods);
+ conn.getLdapContext().modifyAttributes(Utilities.getJNDIName(oldEntry.getDN()), mods);
SwingUtilities.invokeLater(new Runnable()
{
@@ -248,7 +248,7 @@
}
else
{
- modifyAndRename(ctx, oldDn, oldEntry, newEntry, modifications);
+ modifyAndRename(conn, oldDn, oldEntry, newEntry, modifications);
}
state = State.FINISHED_SUCCESSFULLY;
}
@@ -314,7 +314,7 @@
/**
* Modifies and renames the entry.
- * @param ctx the connection to the server.
+ * @param conn the connection to the server.
* @param oldDN the oldDN of the entry.
* @param originalEntry the original entry.
* @param newEntry the new entry.
@@ -323,7 +323,7 @@
* @throws CannotRenameException if we cannot perform the modification.
* @throws NamingException if an error performing the modification occurs.
*/
- private void modifyAndRename(DirContext ctx, final DN oldDN,
+ private void modifyAndRename(ConnectionWrapper conn, final DN oldDN,
CustomSearchResult originalEntry, final Entry newEntry,
final ArrayList<ModificationItem> originalMods)
throws CannotRenameException, NamingException
@@ -353,7 +353,7 @@
}
});
- ctx.rename(Utilities.getJNDIName(oldDn.toString()),
+ conn.getLdapContext().rename(Utilities.getJNDIName(oldDn.toString()),
Utilities.getJNDIName(newEntry.getName().toString()));
final TreePath[] newPath = {null};
@@ -392,7 +392,7 @@
}
});
- ctx.modifyAttributes(Utilities.getJNDIName(newEntry.getName().toString()), mods);
+ conn.getLdapContext().modifyAttributes(Utilities.getJNDIName(newEntry.getName().toString()), mods);
SwingUtilities.invokeLater(new Runnable()
{
--
Gitblit v1.10.0