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/server/ReplicationServer.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
index 6423d53..203088f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.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.server;
@@ -1279,16 +1279,16 @@
* Returns the newest cookie value.
*
* @param excludedBaseDNs
- * The list of baseDNs excluded from ECL.
+ * The set of baseDNs excluded from ECL.
* @return the newest cookie value.
*/
- public MultiDomainServerState getNewestECLCookie(Set<String> excludedBaseDNs)
+ public MultiDomainServerState getNewestECLCookie(Set<DN> excludedBaseDNs)
{
// Initialize start state for all running domains with empty state
final MultiDomainServerState result = new MultiDomainServerState();
for (ReplicationServerDomain rsDomain : getReplicationServerDomains())
{
- if (!contains(excludedBaseDNs, rsDomain.getBaseDN().toNormalizedString()))
+ if (!excludedBaseDNs.contains(rsDomain.getBaseDN()))
{
final ServerState latestDBServerState = rsDomain.getLatestServerState();
if (!latestDBServerState.isEmpty())
@@ -1300,11 +1300,6 @@
return result;
}
- private boolean contains(Set<String> col, String elem)
- {
- return col != null && col.contains(elem);
- }
-
/**
* Gets the weight affected to the replication server.
* <p>
--
Gitblit v1.10.0