From 8c48b025410ca522f8c26a82358500567e5cab85 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 12 Jul 2016 10:32:09 +0000
Subject: [PATCH] dsreplication: code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 20 ++++----------------
1 files changed, 4 insertions(+), 16 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 f5a8666..91ecd91 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
@@ -21,7 +21,6 @@
import static com.forgerock.opendj.cli.CommonArguments.*;
import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.util.OperatingSystem.*;
-import static java.util.Collections.*;
import static org.forgerock.opendj.ldap.SearchScope.*;
import static org.forgerock.opendj.ldap.requests.Requests.*;
@@ -1693,22 +1692,11 @@
{
for (BaseDNDescriptor baseDN : backend.getBaseDns())
{
- SuffixDescriptor suffix = new SuffixDescriptor();
- suffix.setDN(baseDN.getDn());
-
ReplicaDescriptor replica = new ReplicaDescriptor();
-
- if (baseDN.getType() == BaseDNDescriptor.Type.REPLICATED)
- {
- replica.setReplicationId(baseDN.getReplicaID());
- }
- else
- {
- replica.setReplicationId(-1);
- }
- replica.setBackendName(backend.getBackendID());
- replica.setSuffix(suffix);
- suffix.setReplicas(singleton(replica));
+ replica.setReplicationId(
+ baseDN.getType() == BaseDNDescriptor.Type.REPLICATED ? baseDN.getReplicaID() : -1);
+ replica.setBackendId(backend.getBackendID());
+ replica.setSuffix(new SuffixDescriptor(baseDN.getDn(), replica));
replicas.add(replica);
}
--
Gitblit v1.10.0