From 45a05a46b927f19865e6a748873d70efe9a99ac5 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 18:41:17 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 999b805..6517c39 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
@@ -28,7 +28,7 @@
import org.forgerock.opendj.ldap.requests.Requests;
import org.forgerock.opendj.ldap.requests.SearchRequest;
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
-import org.opends.admin.ads.util.ConnectionWrapper;
+import org.opends.guitools.controlpanel.browser.ConnectionWithControls;
import org.opends.guitools.controlpanel.event.EntryReadErrorEvent;
import org.opends.guitools.controlpanel.event.EntryReadEvent;
import org.opends.guitools.controlpanel.event.EntryReadListener;
@@ -41,7 +41,7 @@
public class LDAPEntryReader extends BackgroundTask<Entry>
{
private final DN dn;
- private final ConnectionWrapper conn;
+ private final ConnectionWithControls conn;
private final Set<EntryReadListener> listeners = new HashSet<>();
private boolean isOver;
private boolean notifyListeners;
@@ -51,7 +51,7 @@
* @param dn the DN of the entry.
* @param conn the connection to the server.
*/
- public LDAPEntryReader(DN dn, ConnectionWrapper conn)
+ public LDAPEntryReader(DN dn, ConnectionWithControls conn)
{
this.dn = dn;
this.conn = conn;
@@ -64,7 +64,7 @@
isOver = false;
final Filter filter = Filter.valueOf("(|(objectclass=*)(objectclass=ldapsubentry))");
SearchRequest request = Requests.newSearchRequest(dn, BASE_OBJECT, filter, "*", "+");
- SearchResultEntry sr = conn.getConnection().searchSingleEntry(request);
+ SearchResultEntry sr = conn.searchSingleEntry(request);
if (isInterrupted())
{
isOver = true;
--
Gitblit v1.10.0