From 8c890fb8be9c70a3d10f943c22d1f5db710115e2 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Oct 2014 14:05:02 +0000
Subject: [PATCH] OPENDJ-1559 (CR-4758) Create ReplicaId class to replace use of Pair<DN, Integer>
---
opendj3-server-dev/src/server/org/opends/server/backends/ChangelogBackend.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/ChangelogBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/ChangelogBackend.java
index a9372ce..ccfd346 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/ChangelogBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/ChangelogBackend.java
@@ -76,6 +76,7 @@
import org.opends.server.replication.server.changelog.api.ChangelogDB;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.DBCursor;
+import org.opends.server.replication.server.changelog.api.ReplicaId;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
import org.opends.server.replication.server.changelog.je.ECLEnabledDomainPredicate;
import org.opends.server.replication.server.changelog.je.ECLMultiDomainDBCursor;
@@ -107,8 +108,6 @@
import org.opends.server.types.WritabilityMode;
import org.opends.server.util.StaticUtils;
-import com.forgerock.opendj.util.Pair;
-
import static org.opends.messages.BackendMessages.*;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.config.ConfigConstants.*;
@@ -1750,8 +1749,8 @@
private final SearchPhase startPhase;
private final Set<DN> excludedBaseDNs;
private final MultiDomainServerState cookie;
- private final ConcurrentSkipListMap<Pair<DN, Integer>, SendEntryData<CSN>> replicaIdToSendEntryData =
- new ConcurrentSkipListMap<Pair<DN, Integer>, SendEntryData<CSN>>(Pair.COMPARATOR);
+ private final ConcurrentSkipListMap<ReplicaId, SendEntryData<CSN>> replicaIdToSendEntryData =
+ new ConcurrentSkipListMap<ReplicaId, SendEntryData<CSN>>();
private CookieEntrySender(SearchOperation searchOp, SearchPhase startPhase, MultiDomainServerState cookie,
Set<DN> excludedBaseDNs)
@@ -1780,7 +1779,7 @@
private SendEntryData<CSN> getSendEntryData(DN baseDN, CSN csn)
{
- final Pair<DN, Integer> replicaId = Pair.of(baseDN, csn.getServerId());
+ final ReplicaId replicaId = ReplicaId.of(baseDN, csn.getServerId());
SendEntryData<CSN> data = replicaIdToSendEntryData.get(replicaId);
if (data == null)
{
--
Gitblit v1.10.0