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/NewEntryTask.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
index 7feffcd..b19edb3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
@@ -28,12 +28,13 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
-import javax.naming.ldap.InitialLdapContext;
import javax.swing.SwingUtilities;
import javax.swing.tree.TreePath;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.DN;
+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;
@@ -44,7 +45,6 @@
import org.opends.guitools.controlpanel.ui.nodes.BrowserNodeInfo;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.config.ConfigConstants;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.Entry;
/** The task launched when we must create an entry. */
@@ -157,16 +157,16 @@
try
{
- InitialLdapContext ctx;
+ ConnectionWrapper conn;
if (parentNode != null)
{
- ctx = controller.findConnectionForDisplayedEntry(parentNode);
+ conn = controller.findConnectionForDisplayedEntry(parentNode);
useAdminCtx = controller.isConfigurationNode(parentNode);
}
else
{
- ctx = getInfo().getConnection().getLdapContext();
+ conn = getInfo().getConnection();
useAdminCtx = true;
}
BasicAttributes attrs = new BasicAttributes();
@@ -206,7 +206,7 @@
}
});
- ctx.createSubcontext(Utilities.getJNDIName(newEntry.getName().toString()),
+ conn.getLdapContext().createSubcontext(Utilities.getJNDIName(newEntry.getName().toString()),
attrs);
SwingUtilities.invokeLater(new Runnable()
--
Gitblit v1.10.0