From 3ee70c76e7e5c1cfb8c5ce16bc3f50f2306bdee7 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 18 Aug 2014 11:00:35 +0000
Subject: [PATCH] Forward port of checkpoint commit for OPENDJ-1471 File based changelog : improve cursor behavior
---
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 2ece66c..7e75bf1 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
@@ -705,6 +705,7 @@
// get the last already sent CSN from that server to get a cursor
final CSN lastCSN = startAfterServerState != null ? startAfterServerState.getCSN(serverId) : null;
final DBCursor<UpdateMsg> replicaDBCursor = getCursorFrom(baseDN, serverId, lastCSN);
+ replicaDBCursor.next();
final CSN offlineCSN = getOfflineCSN(offlineReplicas, baseDN, serverId, startAfterServerState);
cursors.put(new ReplicaOfflineCursor(replicaDBCursor, offlineCSN), null);
}
@@ -739,9 +740,7 @@
JEReplicaDB replicaDB = getReplicaDB(baseDN, serverId);
if (replicaDB != null)
{
- DBCursor<UpdateMsg> cursor = replicaDB.generateCursorFrom(startAfterCSN);
- cursor.next();
- return cursor;
+ return replicaDB.generateCursorFrom(startAfterCSN);
}
return EMPTY_CURSOR;
}
--
Gitblit v1.10.0