From c30a14be35ba387e61b960740f6afc1b9774bb3d Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:34 +0000
Subject: [PATCH] Add ConnectionWrapper to replace all uses of InitialLdapContext
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
index 422db83..bba580f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
@@ -48,6 +48,7 @@
import org.opends.admin.ads.ServerDescriptor;
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.admin.ads.util.ConnectionUtils;
+import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.guitools.controlpanel.ControlPanelArgumentParser;
import org.opends.guitools.controlpanel.datamodel.ConfigReadException;
import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
@@ -68,7 +69,6 @@
import org.opends.server.util.StaticUtils;
import static com.forgerock.opendj.cli.Utils.*;
-
import static org.opends.admin.ads.util.ConnectionUtils.*;
import static org.opends.guitools.controlpanel.util.Utilities.*;
import static org.opends.messages.AdminToolMessages.*;
@@ -582,7 +582,8 @@
});
closeInfoConnections();
getInfo().setIsLocal(isLocal);
- getInfo().setDirContext(ctx);
+ getInfo().setConnection(
+ new ConnectionWrapper(ctx, getInfo().getConnectTimeout(), getInfo().getTrustManager()));
getInfo().setUserDataDirContext(null);
getInfo().regenerateDescriptor();
return ctx;
@@ -972,6 +973,7 @@
private void closeInfoConnections()
{
- StaticUtils.close(getInfo().getDirContext(), getInfo().getUserDataDirContext());
+ StaticUtils.close(getInfo().getConnection());
+ StaticUtils.close(getInfo().getUserDataDirContext());
}
}
--
Gitblit v1.10.0