From d03f99a7c7ecd5f3e9e94f84c9b8a3b22d8f232a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Sat, 05 Oct 2013 18:19:50 +0000
Subject: [PATCH] Reverted part of r9660 and all of r9661. I think it was invalid to think that we might want to call getCount() for a given serverId (hence replicaDB) by using the serverId from one of the CSNs. We can very well call getCount() with from and to CSNs that are not present on the targeted replicaDB.
---
opends/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 809bf0e..cd0c63b 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
@@ -375,9 +375,9 @@
/** {@inheritDoc} */
@Override
- public long getCount(DN baseDN, CSN from, CSN to)
+ public long getCount(DN baseDN, int serverId, CSN from, CSN to)
{
- JEReplicaDB replicaDB = getReplicaDB(baseDN, from.getServerId());
+ JEReplicaDB replicaDB = getReplicaDB(baseDN, serverId);
if (replicaDB != null)
{
return replicaDB.getCount(from, to);
--
Gitblit v1.10.0