From 2f7e7e51a205dfa483bd5bb82d90e4ec5719ab9e Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Fri, 15 May 2015 08:35:26 +0000
Subject: [PATCH] OPENDJ-1978 CR-6931 Setup: enable replication 3.0 to 2.6 should not propose to replicate dc=replicationChanges
---
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index b71406b..d83ba8c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -1709,7 +1709,7 @@
{
for (String suffix : suffixes)
{
- if (!isSchemaOrAdminSuffix(suffix))
+ if (!isSchemaOrInternalAdminSuffix(suffix))
{
return false;
}
@@ -1717,10 +1717,11 @@
return true;
}
- private boolean isSchemaOrAdminSuffix(String suffix)
+ private boolean isSchemaOrInternalAdminSuffix(String suffix)
{
return areDnsEqual(suffix, ADSContext.getAdministrationSuffixDN())
- || areDnsEqual(suffix, Constants.SCHEMA_DN);
+ || areDnsEqual(suffix, Constants.SCHEMA_DN)
+ || areDnsEqual(suffix, Constants.REPLICATION_CHANGES_DN);
}
/**
@@ -4723,7 +4724,7 @@
{
for (String dn : availableSuffixes)
{
- if (!isSchemaOrAdminSuffix(dn))
+ if (!isSchemaOrInternalAdminSuffix(dn))
{
try
{
@@ -4871,7 +4872,7 @@
for (String dn : availableSuffixes)
{
- if (!isSchemaOrAdminSuffix(dn))
+ if (!isSchemaOrInternalAdminSuffix(dn))
{
boolean addSuffix;
try
@@ -5715,7 +5716,7 @@
for (SuffixDescriptor suffix : cache.getSuffixes())
{
- if (isSchemaOrAdminSuffix(suffix.getDN()))
+ if (isSchemaOrInternalAdminSuffix(suffix.getDN()))
{
// Do not display these suffixes.
continue;
@@ -5742,7 +5743,7 @@
Set<String> baseDNs = new LinkedHashSet<String>();
for (SuffixDescriptor suffix : beforeLastRepServer)
{
- if (!isSchemaOrAdminSuffix(suffix.getDN()))
+ if (!isSchemaOrInternalAdminSuffix(suffix.getDN()))
{
// Do not display these suffixes.
baseDNs.add(suffix.getDN());
@@ -5775,8 +5776,7 @@
boolean baseDNSpecified = false;
for (String baseDN : uData.getBaseDNs())
{
- if (!isSchemaOrAdminSuffix(baseDN)
- && areDnsEqual(baseDN, suffix.getDN()))
+ if (!isSchemaOrInternalAdminSuffix(baseDN) && areDnsEqual(baseDN, suffix.getDN()))
{
baseDNSpecified = true;
break;
@@ -6110,8 +6110,7 @@
// If no base DNs where specified display all the base DNs but the schema
// and cn=admin data.
- boolean found = containsDN(userBaseDNs, dn)
- || (displayAll && !isSchemaOrAdminSuffix(dn));
+ boolean found = containsDN(userBaseDNs, dn) || (displayAll && !isSchemaOrInternalAdminSuffix(dn));
if (found)
{
boolean replicated = false;
--
Gitblit v1.10.0