From 18bcdc6dd02ec91f32ba9922def2ffb3e4e38073 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 12 Jul 2016 07:38:41 +0000
Subject: [PATCH] Use DNs in dsreplication
---
opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java
index 57acac7..c5774ca 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/TopologyCache.java
@@ -127,7 +127,7 @@
+ replica.getSuffix().getDN()));
boolean suffixFound = false;
- LdapName dn = new LdapName(replica.getSuffix().getDN());
+ LdapName dn = new LdapName(replica.getSuffix().getDN().toString());
Set<SuffixDescriptor> sufs = hmSuffixes.get(dn);
if (sufs != null)
{
@@ -445,7 +445,7 @@
{
SearchResultEntry sr = entryReader.readEntry();
- String dn = firstValueAsString(sr, "domain-name");
+ String dnStr = firstValueAsString(sr, "domain-name");
int replicaId = -1;
try
{
@@ -462,9 +462,10 @@
logger.warn(LocalizableMessage.raw("Unexpected error reading replica ID: " + t, t));
}
+ final DN dn = DN.valueOf(dnStr);
for (ReplicaDescriptor replica : candidateReplicas)
{
- if (Utils.areDnsEqual(dn, replica.getSuffix().getDN())
+ if (dn.equals(replica.getSuffix().getDN())
&& replica.isReplicated()
&& replica.getReplicationId() == replicaId)
{
--
Gitblit v1.10.0