From b6eca1e92df5bee73c6253c2e4e8473173518273 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 19 Aug 2016 14:38:36 +0000
Subject: [PATCH] ReplicaDescriptor: replicationId -> serverId or replicaServerId
---
opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
index e6b7503..c4b256e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
@@ -50,7 +50,7 @@
import org.opends.server.types.HostPort;
/**
- * The object of this class represent an OpenDS server instance.
+ * The object of this class represent an OpenDJ server instance.
* <p>
* It can represent either a DS-only, a RS-only or a combined DS-RS.
*/
@@ -874,7 +874,7 @@
{
SearchResultEntry sr = entryReader.readEntry();
- int id = asInteger(sr, "ds-cfg-server-id");
+ int serverId = asInteger(sr, "ds-cfg-server-id");
Set<HostPort> replicationServers = toHostPorts(asSetOfString(sr, "ds-cfg-replication-server"));
Set<DN> dns = asSetOfDN(sr, "ds-cfg-base-dn");
for (DN dn : dns)
@@ -883,7 +883,7 @@
{
if (replica.getSuffix().getDN().equals(dn))
{
- replica.setReplicationId(id);
+ replica.setServerId(serverId);
replica.setReplicationServers(replicationServers);
allReplicationServers.addAll(replicationServers);
}
--
Gitblit v1.10.0