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/guitools/controlpanel/datamodel/ControlPanelInfo.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
index e7f7931..6363c8a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
@@ -17,6 +17,7 @@
package org.opends.guitools.controlpanel.datamodel;
import static org.opends.admin.ads.util.ConnectionUtils.*;
+import static org.opends.admin.ads.util.PreferredConnection.Type.*;
import static org.opends.guitools.controlpanel.util.Utilities.*;
import static org.opends.server.tools.ConfigureWindowsService.*;
import static com.forgerock.opendj.cli.Utils.*;
@@ -463,20 +464,16 @@
// Try with previous credentials.
try
{
- InitialLdapContext context = null;
if (isLocal)
{
- context = Utilities.getAdminDirContext(this, lastWorkingBindDN, lastWorkingBindPwd);
+ connWrapper = Utilities.getAdminDirContext(this, lastWorkingBindDN, lastWorkingBindPwd);
}
else if (lastRemoteAdministrationURL != null)
{
- context = createLdapsContext(lastRemoteAdministrationURL,
- lastWorkingBindDN,
- lastWorkingBindPwd,
- getConnectTimeout(), null,
- getTrustManager(), null);
+ connWrapper = new ConnectionWrapper(
+ lastRemoteAdministrationURL, LDAPS, lastWorkingBindDN, lastWorkingBindPwd,
+ getConnectTimeout(), getTrustManager());
}
- connWrapper = new ConnectionWrapper(context, getConnectTimeout(), getTrustManager());
}
catch (ConfigReadException | NamingException cre)
{
--
Gitblit v1.10.0