From 2bab8946d210e6795e98ae6277a1e9f102d15458 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 21 Nov 2013 16:33:01 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1174 Transfer responsibility for populating the ChangeNumberIndexDB to ChangelogDB
---
opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java b/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
index ec032fa..2e00f89 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
@@ -688,18 +688,20 @@
ServerState startAfterServerState) throws ChangelogException
{
final Set<Integer> serverIds = getDomainMap(baseDN).keySet();
- final List<DBCursor<UpdateMsg>> cursors =
- new ArrayList<DBCursor<UpdateMsg>>(serverIds.size());
+ final Map<DBCursor<UpdateMsg>, Void> cursors =
+ new HashMap<DBCursor<UpdateMsg>, Void>(serverIds.size());
for (int serverId : serverIds)
{
// get the last already sent CSN from that server to get a cursor
final CSN lastCSN = startAfterServerState.getCSN(serverId);
- cursors.add(getCursorFrom(baseDN, serverId, lastCSN));
+ cursors.put(getCursorFrom(baseDN, serverId, lastCSN), null);
}
- return new CompositeDBCursor(cursors);
+ return new CompositeDBCursor<Void>(cursors);
}
- private DBCursor<UpdateMsg> getCursorFrom(DN baseDN, int serverId,
+ /** {@inheritDoc} */
+ @Override
+ public DBCursor<UpdateMsg> getCursorFrom(DN baseDN, int serverId,
CSN startAfterCSN) throws ChangelogException
{
JEReplicaDB replicaDB = getReplicaDB(baseDN, serverId);
--
Gitblit v1.10.0