From 88621d06374fccbf95448f6e65fccfdc38e5e8cb Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 22 Oct 2007 10:49:38 +0000
Subject: [PATCH] Fix for issue 2405.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java | 8 +++++---
opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
index b37b5cd..eb41f42 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
@@ -5053,7 +5053,7 @@
{
int domainId = InstallerHelper.getReplicationId(usedReplicationDomainIds);
usedReplicationDomainIds.add(domainId);
- domainName = InstallerHelper.getDomainName(domainNames, domainId);
+ domainName = InstallerHelper.getDomainName(domainNames, domainId, baseDN);
domain = sync.createReplicationDomain(
ReplicationDomainCfgDefn.getInstance(), domainName,
new ArrayList<DefaultBehaviorException>());
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
index 1b73493..c8ca3c7 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
@@ -383,7 +383,7 @@
{
int domainId = getReplicationId(usedServerIds);
usedServerIds.add(domainId);
- domainName = getDomainName(domainNames, domainId);
+ domainName = getDomainName(domainNames, domainId, dn);
domain = sync.createReplicationDomain(
ReplicationDomainCfgDefn.getInstance(), domainName,
new ArrayList<DefaultBehaviorException>());
@@ -625,11 +625,13 @@
* Returns the name to be used for a new replication domain.
* @param existingDomains the existing domains names.
* @param newDomainId the new domain replication id.
+ * @param baseDN the base DN of the domain.
* @return the name to be used for a new replication domain.
*/
- public static String getDomainName(String[] existingDomains, int newDomainId)
+ public static String getDomainName(String[] existingDomains, int newDomainId,
+ String baseDN)
{
- String domainName = DOMAIN_BASE_NAME+newDomainId;
+ String domainName = baseDN + " ("+DOMAIN_BASE_NAME+newDomainId+")";
boolean nameExists = true;
int j = 0;
while (nameExists)
--
Gitblit v1.10.0