From 08154804f671e1c471df14ac999e6d6bb18bbd37 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 01 Jul 2016 14:30:12 +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/server/tools/dsreplication/ReplicationCliMain.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index 37f01a1..a574f38 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -5839,7 +5839,7 @@
}
}
}
- String bindDn = conn.getBindDn().toString();
+ DN bindDn = conn.getBindDn();
String pwd = conn.getBindPassword();
for (ServerDescriptor s : serversToUpdate)
{
@@ -7526,7 +7526,7 @@
* configuration.
*/
private void removeReferencesInServer(ServerDescriptor server,
- String replicationServer, String bindDn, String pwd,
+ String replicationServer, DN bindDn, String pwd,
Collection<String> baseDNs, boolean updateReplicationServers,
Set<PreferredConnection> cnx)
throws ReplicationCliException
@@ -9507,8 +9507,9 @@
private ConnectionWrapper getConnection(TopologyCache cache, ServerDescriptor server) throws NamingException
{
- String dn = getBindDN(cache.getAdsContext().getDirContext());
- String pwd = getBindPassword(cache.getAdsContext().getDirContext());
+ ConnectionWrapper conn = cache.getAdsContext().getConnection();
+ DN dn = conn.getBindDn();
+ String pwd = conn.getBindPassword();
TopologyCacheFilter filter = new TopologyCacheFilter();
filter.setSearchMonitoringInformation(false);
filter.setSearchBaseDNInformation(false);
--
Gitblit v1.10.0