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/replication/server/changelog/je/JEChangelogDB.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
index 21baff1..63c3f5d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
@@ -56,6 +56,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.DBCursor.KeyMatchingStrategy;
import org.opends.server.replication.server.changelog.api.DBCursor.PositionStrategy;
import org.opends.server.replication.server.changelog.api.ReplicationDomainDB;
@@ -99,8 +100,8 @@
new HashMap<DN, List<DomainDBCursor>>();
private final CopyOnWriteArrayList<MultiDomainDBCursor> registeredMultiDomainCursors =
new CopyOnWriteArrayList<MultiDomainDBCursor>();
- private final ConcurrentSkipListMap<Pair<DN, Integer>, List<ReplicaCursor>> replicaCursors =
- new ConcurrentSkipListMap<Pair<DN, Integer>, List<ReplicaCursor>>(Pair.COMPARATOR);
+ private final ConcurrentSkipListMap<ReplicaId, List<ReplicaCursor>> replicaCursors =
+ new ConcurrentSkipListMap<ReplicaId, List<ReplicaCursor>>();
private ReplicationDbEnv replicationEnv;
private final ReplicationServerCfg config;
private final File dbDirectory;
@@ -781,16 +782,16 @@
{
final DBCursor<UpdateMsg> cursor = replicaDB.generateCursorFrom(startCSN, matchingStrategy, positionStrategy);
final CSN offlineCSN = getOfflineCSN(baseDN, serverId, startCSN);
- final Pair<DN, Integer> replicaID = Pair.of(baseDN, serverId);
- final ReplicaCursor replicaCursor = new ReplicaCursor(cursor, offlineCSN, replicaID, this);
+ final ReplicaId replicaId = ReplicaId.of(baseDN, serverId);
+ final ReplicaCursor replicaCursor = new ReplicaCursor(cursor, offlineCSN, replicaId, this);
synchronized (replicaCursors)
{
- List<ReplicaCursor> cursors = replicaCursors.get(replicaID);
+ List<ReplicaCursor> cursors = replicaCursors.get(replicaId);
if (cursors == null)
{
cursors = new ArrayList<ReplicaCursor>();
- replicaCursors.put(replicaID, cursors);
+ replicaCursors.put(replicaId, cursors);
}
cursors.add(replicaCursor);
}
@@ -823,7 +824,7 @@
else if (cursor instanceof ReplicaCursor)
{
final ReplicaCursor replicaCursor = (ReplicaCursor) cursor;
- final List<ReplicaCursor> cursors = replicaCursors.get(replicaCursor.getReplicaID());
+ final List<ReplicaCursor> cursors = replicaCursors.get(replicaCursor.getReplicaId());
if (cursors != null)
{
cursors.remove(cursor);
@@ -888,7 +889,7 @@
private void updateCursorsWithOfflineCSN(final DN baseDN, int serverId, final CSN offlineCSN)
{
- final List<ReplicaCursor> cursors = replicaCursors.get(Pair.of(baseDN, serverId));
+ final List<ReplicaCursor> cursors = replicaCursors.get(ReplicaId.of(baseDN, serverId));
if (cursors != null && !cursors.isEmpty())
{
for (ReplicaCursor cursor : cursors)
--
Gitblit v1.10.0