mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

jvergara
22.10.2009 9a5d899eb222c92003ae610da73ab429e6fa3caa
Complete fix for issue 4410 (dsreplication --disableAll does not remove all the references to the server in cn=admin data).

With these changes, the references in cn=config are also removed.
1 files modified
17 ■■■■■ changed files
opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java 17 ●●●●● patch | view | raw | blame | history
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())