From 39cfb739395cca91589c958fda4790c87ce0c9c8 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 02 Jan 2015 14:42:16 +0000
Subject: [PATCH] OPENDJ-1585 Re-implement DN normalization in server
---
opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
index c43111b..9a67737 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -852,16 +852,18 @@
* Gets the Set of domain baseDN which are disabled for the external changelog.
*
* @return The Set of domain baseDNs which are disabled for the external changelog.
+ * @throws DirectoryException
+ * if a problem occurs
*/
- public static Set<String> getExcludedChangelogDomains()
+ public static Set<DN> getExcludedChangelogDomains() throws DirectoryException
{
- final Set<String> disabledBaseDNs = new HashSet<String>(domains.size() + 1);
- disabledBaseDNs.add(DN_EXTERNAL_CHANGELOG_ROOT);
+ final Set<DN> disabledBaseDNs = new HashSet<DN>(domains.size() + 1);
+ disabledBaseDNs.add(DN.valueOf(DN_EXTERNAL_CHANGELOG_ROOT));
for (LDAPReplicationDomain domain : domains.values())
{
if (!domain.isECLEnabled())
{
- disabledBaseDNs.add(domain.getBaseDN().toNormalizedString());
+ disabledBaseDNs.add(domain.getBaseDN());
}
}
return disabledBaseDNs;
--
Gitblit v1.10.0