From 2dc104de03990454132bd41e3b9f4fe1a47f9ffd Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 19 Apr 2016 16:44:22 +0000
Subject: [PATCH] Converted try/finally Closeable.close() (or Utils.closeSilently()) into try-with-resources
---
opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPDriver.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPDriver.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPDriver.java
index 9e6aff1..264e1ab 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPDriver.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPDriver.java
@@ -64,6 +64,8 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchResultReferenceIOException;
import org.forgerock.opendj.ldap.SearchScope;
+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;
@@ -524,18 +526,15 @@
}
private Collection<DN> listEntries(DN dn, Filter filter) throws LdapException {
- List<DN> names = new LinkedList<>();
- ConnectionEntryReader reader =
- connection.search(dn.toString(), SearchScope.SINGLE_LEVEL, filter.toString());
- try {
+ final SearchRequest searchRequest = Requests.newSearchRequest(dn, SearchScope.SINGLE_LEVEL, filter);
+ try (ConnectionEntryReader reader = connection.search(searchRequest)) {
+ List<DN> names = new LinkedList<>();
while (reader.hasNext()) {
names.add(reader.readEntry().getName());
}
- } catch (SearchResultReferenceIOException e) {
- // Ignore.
- } finally {
- reader.close();
+ return names;
+ } catch (SearchResultReferenceIOException ignore) {
+ return Collections.emptyList();
}
- return names;
}
}
--
Gitblit v1.10.0