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/util/LDAPEntryReader.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java
index 9e97f1f..1c27e7d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java
@@ -23,8 +23,8 @@
import javax.naming.NamingEnumeration;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import javax.naming.ldap.InitialLdapContext;
+import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
import org.opends.guitools.controlpanel.event.EntryReadErrorEvent;
import org.opends.guitools.controlpanel.event.EntryReadEvent;
@@ -38,7 +38,7 @@
public class LDAPEntryReader extends BackgroundTask<CustomSearchResult>
{
private final String dn;
- private final InitialLdapContext ctx;
+ private final ConnectionWrapper conn;
private final Set<EntryReadListener> listeners = new HashSet<>();
private boolean isOver;
private boolean notifyListeners;
@@ -46,12 +46,12 @@
/**
* Constructor of the entry reader.
* @param dn the DN of the entry.
- * @param ctx the connection to the server.
+ * @param conn the connection to the server.
*/
- public LDAPEntryReader(String dn, InitialLdapContext ctx)
+ public LDAPEntryReader(String dn, ConnectionWrapper conn)
{
this.dn = dn;
- this.ctx = ctx;
+ this.conn = conn;
this.notifyListeners = true;
}
@@ -69,7 +69,7 @@
controls.setSearchScope(SearchControls.OBJECT_SCOPE);
final String filter = "(|(objectclass=*)(objectclass=ldapsubentry))";
- en = ctx.search(Utilities.getJNDIName(dn), filter, controls);
+ en = conn.getLdapContext().search(Utilities.getJNDIName(dn), filter, controls);
SearchResult sr = null;
while (en.hasMore())
--
Gitblit v1.10.0