Revert mistake in ReplicationCliMain.java

Jean-Noël Rouvignac

22.22.2016 0ac97224b017f39d8e6a29a8f7ca7c7dd6e4dca6

Revert mistake in ReplicationCliMain.java

This change was commigtted in ad326bc588eb60ff6dafd6320eb2c74d8f37cd58.

 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java

@@ -336,7 +336,6 @@
   *
   * @return The error code.
   */

  public static int mainCLI(String[] args)
  {
    return mainCLI(args, true, System.out, System.err);
@@ -4732,6 +4731,7 @@
          ERR_REPLICATION_UPDATING_ADS.get(adce.getMessageObject()),
          ERROR_UPDATING_ADS, adce);
    }

    if (!adsAlreadyReplicated && !adsMergeDone)
    {
      try
@@ -5024,8 +5024,8 @@

  private void addReplicaServerIds(Set<Integer> replicaServerIds, ServerDescriptor serverDesc1, DN baseDN)
  {
    ReplicaDescriptor replica = findReplicaForSuffixDN(serverDesc1.getReplicas(), baseDN);
    if (replica != null && replica.isReplicated())
    ReplicaDescriptor replica = findReplicatedReplicaForSuffixDN(serverDesc1.getReplicas(), baseDN);
    if (replica != null)
    {
      replicaServerIds.add(replica.getServerId());
    }
@@ -9035,6 +9035,18 @@
    return null;
  }

  private ReplicaDescriptor findReplicatedReplicaForSuffixDN(Set<ReplicaDescriptor> replicas, DN baseDN)
  {
    for (ReplicaDescriptor replica : replicas)
    {
      if (replica.isReplicated() && replica.getSuffix().getDN().equals(baseDN))
      {
        return replica;
      }
    }
    return null;
  }

  private Set<DN> findAllReplicatedSuffixDNs(Collection<ReplicaDescriptor> replicas)
  {
    Set<DN> results = new HashSet<>();