From fdb3fa313407639240f75ec566865cea25bc039b Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 11 Jul 2016 12:01:16 +0000
Subject: [PATCH] Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead
---
opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/Uninstaller.java | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/Uninstaller.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/Uninstaller.java
index 8787314..6ba1385 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/Uninstaller.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/Uninstaller.java
@@ -33,8 +33,6 @@
import java.util.Map;
import java.util.Set;
-import javax.naming.Context;
-import javax.naming.NamingException;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
@@ -1471,16 +1469,7 @@
getUninstallUserData().setAdminUID(loginDialog.getAdministratorUid());
getUninstallUserData().setAdminPwd(loginDialog.getAdministratorPwd());
final ConnectionWrapper connWrapper = loginDialog.getConnection();
- try
- {
- getUninstallUserData().setLocalServerUrl(
- (String)connWrapper.getLdapContext().getEnvironment().get(Context.PROVIDER_URL));
- }
- catch (NamingException ne)
- {
- logger.warn(LocalizableMessage.raw("Could not find local server: "+ne, ne));
- getUninstallUserData().setLocalServerUrl("ldap://localhost:389");
- }
+ getUninstallUserData().setLocalServerUrl(connWrapper.getLdapUrl());
getUninstallUserData().setReplicationServer(
loginDialog.getHostName() + ":" +
conf.getReplicationServerPort());
--
Gitblit v1.10.0