From e55031aae085330b0d7b841d40cb1064c6c15867 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 02 Aug 2016 07:38:16 +0000
Subject: [PATCH] use DN in dsreplication
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java | 33 ++++++++-------------------------
1 files changed, 8 insertions(+), 25 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 196f3f2..2a3bc99 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
@@ -35,6 +35,7 @@
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.datamodel.ControlPanelInfo;
import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
import org.opends.guitools.controlpanel.util.BackgroundTask;
import org.opends.guitools.controlpanel.util.Utilities;
@@ -185,29 +186,11 @@
ConnectionWrapper conn = null;
try
{
- usedUrl = getInfo().getAdminConnectorURL();
- conn = Utilities.getAdminDirContext(getInfo(), dn.getText(), String.valueOf(pwd.getPassword()));
+ ControlPanelInfo info = getInfo();
+ usedUrl = info.getAdminConnectorURL();
+ conn = Utilities.getAdminDirContext(info, DN.valueOf(dn.getText()), String.valueOf(pwd.getPassword()));
- if (getInfo().getConnection() != null)
- {
- try
- {
- getInfo().getConnection().close();
- }
- catch (Throwable t)
- {
- }
- }
- if (getInfo().getUserDataDirContext() != null)
- {
- try
- {
- getInfo().getUserDataDirContext().close();
- }
- catch (Throwable t)
- {
- }
- }
+ org.forgerock.util.Utils.closeSilently(info.getConnection(), info.getUserDataDirContext());
try
{
Thread.sleep(500);
@@ -224,9 +207,9 @@
INFO_CTRL_PANEL_READING_CONFIGURATION_SUMMARY.get());
}
});
- getInfo().setConnection(conn);
- getInfo().setUserDataDirContext(null);
- getInfo().regenerateDescriptor();
+ info.setConnection(conn);
+ info.setUserDataDirContext(null);
+ info.regenerateDescriptor();
return conn;
} catch (Throwable t)
{
--
Gitblit v1.10.0