From c9958277baf5f911bda401802259a4b50d9cd599 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 03 Aug 2016 16:06:26 +0000
Subject: [PATCH] BasicNode: use DN
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 6b8da9b..5f5445f 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
@@ -22,6 +22,8 @@
import java.util.HashSet;
import java.util.Set;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.Filter;
import org.forgerock.opendj.ldap.requests.Requests;
import org.forgerock.opendj.ldap.requests.SearchRequest;
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
@@ -38,7 +40,7 @@
*/
public class LDAPEntryReader extends BackgroundTask<CustomSearchResult>
{
- private final String dn;
+ private final DN dn;
private final ConnectionWrapper conn;
private final Set<EntryReadListener> listeners = new HashSet<>();
private boolean isOver;
@@ -49,7 +51,7 @@
* @param dn the DN of the entry.
* @param conn the connection to the server.
*/
- public LDAPEntryReader(String dn, ConnectionWrapper conn)
+ public LDAPEntryReader(DN dn, ConnectionWrapper conn)
{
this.dn = dn;
this.conn = conn;
@@ -60,7 +62,7 @@
public CustomSearchResult processBackgroundTask() throws Throwable
{
isOver = false;
- final String filter = "(|(objectclass=*)(objectclass=ldapsubentry))";
+ final Filter filter = Filter.valueOf("(|(objectclass=*)(objectclass=ldapsubentry))");
SearchRequest request = Requests.newSearchRequest(dn, BASE_OBJECT, filter, "*", "+");
SearchResultEntry sr = conn.getConnection().searchSingleEntry(request);
if (isInterrupted())
--
Gitblit v1.10.0