From 9b631cdf163fa784b2d72cfb4f56288e2c8702c7 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 07 Feb 2013 09:29:11 +0000
Subject: [PATCH] Fix Jumbo issue OPENDJ-747 ;-) Run a subtree search to find the replication server, rather than reading directly the supposedly existing entry. This prevent an error to be logged in access log if the current server has no replication server.
---
opends/src/ads/org/opends/admin/ads/ServerDescriptor.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java b/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
index f3078cb..d02b8cb 100644
--- a/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
+++ b/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
+ * Portion Copyright 2013 ForgeRock AS.
*/
package org.opends.admin.ads;
@@ -1176,7 +1177,7 @@
}
ctls = new SearchControls();
- ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
+ ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
ctls.setReturningAttributes(
new String[] {
"ds-cfg-replication-port", "ds-cfg-replication-server",
@@ -1184,7 +1185,7 @@
});
filter = "(objectclass=ds-cfg-replication-server)";
- jndiName = new LdapName("cn=Replication Server,cn=Multimaster "+
+ jndiName = new LdapName("cn=Multimaster "+
"Synchronization,cn=Synchronization Providers,cn=config");
desc.serverProperties.put(ServerProperty.IS_REPLICATION_SERVER,
--
Gitblit v1.10.0