From 13819a2e81db0422a7c8c186f838c7b243173170 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 03 Sep 2014 06:30:37 +0000
Subject: [PATCH] OPENDJ-1205 (CR-4428) Remove network layer from External ChangeLog implementation
---
opends/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java b/opends/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java
index c3e0ff7..c86939e 100644
--- a/opends/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java
+++ b/opends/src/server/org/opends/server/replication/common/LastCookieVirtualProvider.java
@@ -34,13 +34,12 @@
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.replication.plugin.MultimasterReplication;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.types.*;
-import org.opends.server.util.ServerConstants;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.replication.plugin.MultimasterReplication.*;
/**
* This class implements a virtual attribute provider in the root-dse entry
@@ -94,11 +93,7 @@
{
if (replicationServer != null)
{
- // Set a list of excluded domains (also exclude 'cn=changelog' itself)
- Set<String> excludedDomains = MultimasterReplication.getECLDisabledDomains();
- excludedDomains.add(ServerConstants.DN_EXTERNAL_CHANGELOG_ROOT);
-
- String newestCookie = replicationServer.getNewestECLCookie(excludedDomains).toString();
+ String newestCookie = replicationServer.getNewestECLCookie(getExcludedChangelogDomains()).toString();
final ByteString cookie = ByteString.valueOf(newestCookie);
return Collections.singleton(AttributeValues.create(cookie, cookie));
}
--
Gitblit v1.10.0