From 480b7c62e7f72d84061cfe4e8381a18dbd90b638 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 15 Mar 2012 16:21:01 +0000
Subject: [PATCH] Final fix for OPENDJ-249: dsreplication disable --disableAll error removing contents of "cn=admin data"

---
 opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index 2d25f5f..b8f32f0 100644
--- a/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -7017,22 +7017,6 @@
             ERR_REPLICATION_UPDATING_ADS.get(adce.getMessageObject()),
             ERROR_UPDATING_ADS, adce);
       }
-      try
-      {
-        // Delete all contents from truststore.
-        printProgress(formatter.getFormattedWithPoints(
-            INFO_REPLICATION_REMOVE_TRUSTSTORE_CONTENTS.get()));
-        ServerDescriptor.cleanAdsTrustStore(adsCtx.getDirContext());
-        printProgress(formatter.getFormattedDone());
-        printlnProgress();
-      }
-      catch (Throwable t)
-      {
-        LOG.log(Level.SEVERE, "Error removing contents of truststore: "+t, t);
-        throw new ReplicationCliException(
-            ERR_REPLICATION_UPDATING_ADS.get(t.toString()),
-            ERROR_UPDATING_ADS, t);
-      }
     }
     else if (disableAllBaseDns &&
         (disableReplicationServer || !server.isReplicationServer()))

--
Gitblit v1.10.0