From 18dc6866af53fb06efb0879f9c9c369e698d7379 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 18 Apr 2016 06:57:37 +0000
Subject: [PATCH] Remove ConnectionWrapper constructor accepting an InitialLdapContext
---
opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java
index 7ffe277..6100447 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java
@@ -30,7 +30,6 @@
import javax.naming.NamingException;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import javax.naming.ldap.InitialLdapContext;
import javax.naming.ldap.LdapName;
import org.forgerock.i18n.LocalizableMessage;
@@ -38,10 +37,10 @@
import org.opends.admin.ads.ADSContext.ServerProperty;
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.admin.ads.util.ConnectionUtils;
+import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.admin.ads.util.PreferredConnection;
import org.opends.admin.ads.util.ServerLoader;
import org.opends.quicksetup.util.Utils;
-import org.opends.server.util.StaticUtils;
import static com.forgerock.opendj.cli.Utils.*;
@@ -441,15 +440,11 @@
"domain-name", "server-id"
});
- InitialLdapContext ctx = null;
NamingEnumeration<SearchResult> monitorEntries = null;
- try
+ ServerLoader loader = getServerLoader(replicationServer.getAdsProperties());
+ try (ConnectionWrapper conn = loader.createConnectionWrapper())
{
- ServerLoader loader =
- getServerLoader(replicationServer.getAdsProperties());
- ctx = loader.createContext();
-
- monitorEntries = ctx.search(
+ monitorEntries = conn.getLdapContext().search(
new LdapName("cn=monitor"), "(missing-changes=*)", ctls);
while (monitorEntries.hasMore())
@@ -505,7 +500,6 @@
"Unexpected error closing enumeration on monitor entries" + t, t));
}
}
- StaticUtils.close(ctx);
}
}
--
Gitblit v1.10.0