From 83ae76453e0b08ead8c12bd71c85445bdbbdb590 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 03 Aug 2016 16:05:42 +0000
Subject: [PATCH] Avoid DN being shown twice on UI: dc=example,dc=com,dc=example,dc=com
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java | 20 ++++----------------
1 files changed, 4 insertions(+), 16 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 06e8e81..6b8da9b 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
@@ -25,7 +25,6 @@
import org.forgerock.opendj.ldap.requests.Requests;
import org.forgerock.opendj.ldap.requests.SearchRequest;
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
-import org.forgerock.opendj.ldif.ConnectionEntryReader;
import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
import org.opends.guitools.controlpanel.event.EntryReadErrorEvent;
@@ -63,23 +62,12 @@
isOver = false;
final String filter = "(|(objectclass=*)(objectclass=ldapsubentry))";
SearchRequest request = Requests.newSearchRequest(dn, BASE_OBJECT, filter, "*", "+");
- try (ConnectionEntryReader entryReader = conn.getConnection().search(request))
+ SearchResultEntry sr = conn.getConnection().searchSingleEntry(request);
+ if (isInterrupted())
{
- SearchResultEntry sr = null;
- while (entryReader.hasNext())
- {
- sr = entryReader.readEntry();
- }
-
- return new CustomSearchResult(sr, dn);
+ isOver = true;
}
- finally
- {
- if (isInterrupted())
- {
- isOver = true;
- }
- }
+ return new CustomSearchResult(sr);
}
@Override
--
Gitblit v1.10.0