Follow up to fix for issue 4092 (dsreplication should allow to configure se...

jvergara

09.48.2009 91563f41959bd84d371e8f943064bd1cab7fac0c

Follow up to fix for issue 4092 (dsreplication should allow to configure servers with no replication server and servers with only a replication server)
Fix an issue with port check in non-interactive mode when the user decides not to configure a replication port.
Fix an issue when adding a replication domain (with no replication server) to an existing topology.

 opendj-sdk/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java

@@ -299,7 +299,8 @@
  public void setAdsProperties(
      Map<ADSContext.ServerProperty, Object> adsProperties)
  {
    this.adsProperties = adsProperties;
    this.adsProperties.clear();
    this.adsProperties.putAll(adsProperties);
  }

  /**

 opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java

@@ -159,6 +159,7 @@
      ctx = createContext();
      serverDescriptor = ServerDescriptor.createStandalone(ctx, filter);
      serverDescriptor.setAdsProperties(serverProperties);
      serverDescriptor.updateAdsPropertiesWithServerProperties();
    }
    catch (NoPermissionException npe)
    {

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

@@ -3294,6 +3294,7 @@
        if (!hasReplicationPort1)
        {
          if (!argParser.skipReplicationPortCheck() &&
              uData.configureReplicationServer1() &&
              isLocalHost(host1) &&
              !SetupUtils.canUseAsPort(replPort1))
          {
@@ -3303,6 +3304,7 @@
        if (!hasReplicationPort2)
        {
          if (!argParser.skipReplicationPortCheck() &&
              uData.configureReplicationServer2() &&
              isLocalHost(host2) &&
              !SetupUtils.canUseAsPort(replPort2))
          {
@@ -7130,7 +7132,7 @@
        ServerDescriptor s = replica.getServer();
        if (!alreadyConfiguredServers.contains(s.getId()))
        {
          serversToConfigureDomain.add(server);
          serversToConfigureDomain.add(s);
        }
      }
    }