From 91563f41959bd84d371e8f943064bd1cab7fac0c Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 08 Jul 2009 23:48:32 +0000
Subject: [PATCH] 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/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 4 +++-
opendj-sdk/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java | 3 ++-
opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java b/opendj-sdk/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
index 47e75b0..468e4d5 100644
--- a/opendj-sdk/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
+++ b/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);
}
/**
diff --git a/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java b/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java
index a8c5114..7e108d3 100644
--- a/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java
+++ b/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)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index f99ac73..590bc65 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/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);
}
}
}
--
Gitblit v1.10.0