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/LoginPanel.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java
index a69787f..c8dfdf0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java
@@ -34,6 +34,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.admin.ads.util.ApplicationTrustManager;
+import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.guitools.controlpanel.datamodel.ConfigReadException;
import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
import org.opends.guitools.controlpanel.util.BackgroundTask;
@@ -46,7 +47,6 @@
import org.opends.server.util.StaticUtils;
import static com.forgerock.opendj.cli.Utils.*;
-
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
@@ -204,11 +204,11 @@
ctx = Utilities.getAdminDirContext(getInfo(), dn.getText(),
String.valueOf(pwd.getPassword()));
- if (getInfo().getDirContext() != null)
+ if (getInfo().getConnection() != null)
{
try
{
- getInfo().getDirContext().close();
+ getInfo().getConnection().close();
}
catch (Throwable t)
{
@@ -240,7 +240,8 @@
INFO_CTRL_PANEL_READING_CONFIGURATION_SUMMARY.get());
}
});
- getInfo().setDirContext(ctx);
+ getInfo().setConnection(
+ new ConnectionWrapper(ctx, getInfo().getConnectTimeout(), getInfo().getTrustManager()));
getInfo().setUserDataDirContext(null);
getInfo().regenerateDescriptor();
return ctx;
--
Gitblit v1.10.0