From decce1e74734c3f951d789f1887a55352fadc323 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 22 Dec 2009 16:10:29 +0000
Subject: [PATCH] Complete fix for issue 4410 (dsreplication --disableAll does not remove all the references to the server in cn=admin data).
---
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
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 16f8b62..b38c1fb 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
@@ -5682,10 +5682,13 @@
ServerDescriptor server;
TopologyCacheFilter filter = new TopologyCacheFilter();
filter.setSearchMonitoringInformation(false);
- filter.addBaseDNToSearch(ADSContext.getAdministrationSuffixDN());
- for (String dn : uData.getBaseDNs())
+ if (!uData.disableAll())
{
- filter.addBaseDNToSearch(dn);
+ filter.addBaseDNToSearch(ADSContext.getAdministrationSuffixDN());
+ for (String dn : uData.getBaseDNs())
+ {
+ filter.addBaseDNToSearch(dn);
+ }
}
try
{
@@ -5712,9 +5715,12 @@
cache.setPreferredConnections(
PreferredConnection.getPreferredConnections(ctx));
cache.getFilter().setSearchMonitoringInformation(false);
- for (String dn : uData.getBaseDNs())
+ if (!uData.disableAll())
{
- cache.getFilter().addBaseDNToSearch(dn);
+ for (String dn : uData.getBaseDNs())
+ {
+ cache.getFilter().addBaseDNToSearch(dn);
+ }
}
cache.reloadTopology();
}
@@ -6001,7 +6007,6 @@
if (uData.disableAll())
{
- suffixesToDisable.clear();
for (ReplicaDescriptor replica : server.getReplicas())
{
if (replica.isReplicated())
--
Gitblit v1.10.0