ReplicaDescriptor: replicationId -> serverId or replicaServerId

Jean-Noël Rouvignac

19.22.2016 b6eca1e92df5bee73c6253c2e4e8473173518273

 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);
              }