From 72248c62be47eed96fba12a9dec44ca0b33b73b7 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 14 Mar 2012 22:34:27 +0000
Subject: [PATCH] Initial fix for OPENDJ-249: dsreplication disable --disableAll error removing contents of "cn=admin data"

---
 opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java |   13 +------------
 1 files changed, 1 insertions(+), 12 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 dd7d29b..2d25f5f 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
@@ -7005,18 +7005,7 @@
         // Delete all contents from ADSContext.
         printProgress(formatter.getFormattedWithPoints(
             INFO_REPLICATION_REMOVE_ADS_CONTENTS.get()));
-        adsCtx.removeAdminData();
-        String adminBackendName = null;
-        for (ReplicaDescriptor replica : server.getReplicas())
-        {
-          if (Utils.areDnsEqual(ADSContext.getAdministrationSuffixDN(),
-              replica.getSuffix().getDN()))
-          {
-            adminBackendName = replica.getBackendName();
-            break;
-          }
-        }
-        adsCtx.createAdminData(adminBackendName);
+        adsCtx.removeAdminData(false /* avoid self-disconnect */);
         printProgress(formatter.getFormattedDone());
         printlnProgress();
       }

--
Gitblit v1.10.0