From 986733aa01992e78f973cddbd18f3d02bb62f60e Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 22 May 2015 12:52:57 +0000
Subject: [PATCH] OPENDJ-2017 (CR-7035) Setup GUI: Fix replication setup

---
 opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
index 718fc55..c70e802 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
@@ -26,6 +26,8 @@
  */
 package org.opends.admin.ads;
 
+import static org.opends.admin.ads.util.ConnectionUtils.*;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -38,7 +40,12 @@
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
-import javax.naming.directory.*;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
 import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
@@ -48,10 +55,9 @@
 import org.opends.admin.ads.util.ConnectionUtils;
 import org.opends.quicksetup.Constants;
 import org.opends.quicksetup.util.Utils;
+import org.opends.server.config.ConfigConstants;
 import org.opends.server.schema.SchemaConstants;
 
-import static org.opends.admin.ads.util.ConnectionUtils.*;
-
 /**
  * The object of this class represent an OpenDS server.
  */
@@ -935,7 +941,8 @@
     ctls.setReturningAttributes(
         new String[] {
             "ds-cfg-base-dn",
-            "ds-cfg-backend-id"
+            "ds-cfg-backend-id",
+            ConfigConstants.ATTR_OBJECTCLASS
         });
     String filter = "(objectclass=ds-cfg-backend)";
 
@@ -986,6 +993,7 @@
               suffix.setDN(baseDn);
               ReplicaDescriptor replica = new ReplicaDescriptor();
               replica.setServer(desc);
+              replica.setObjectClasses(getValues(sr, ConfigConstants.ATTR_OBJECTCLASS));
               replica.setBackendName(id);
               replicas.add(replica);
               HashSet<ReplicaDescriptor> r = new HashSet<>();

--
Gitblit v1.10.0