From 157717b205d4c1f957cf810e04e06f11530c619c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 02 Sep 2013 08:57:43 +0000
Subject: [PATCH] Renamed: - ChangeNumber to CSN - ChangeNumberGenerator to CSNGenerator - ChangeNumberTest to CSNTest - ChangeNumberGeneratorTest to CSNGeneratorTest
---
opends/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java b/opends/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java
index 5552ab2..852a20b 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java
@@ -28,7 +28,7 @@
package org.opends.server.replication.server.changelog.je;
import org.opends.messages.Message;
-import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.ReplicaDBCursor;
@@ -43,7 +43,7 @@
private ReplServerDBCursor cursor = null;
private DbHandler dbHandler;
private ReplicationDB db;
- private ChangeNumber lastNonNullCurrentCN;
+ private CSN lastNonNullCurrentCSN;
/**
* Creates a new {@link JEReplicaDBCursor}. All created cursor must be
@@ -51,23 +51,23 @@
*
* @param db
* The db where the cursor must be created.
- * @param startAfterCN
- * The ChangeNumber after which the cursor must start.
+ * @param startAfterCSN
+ * The CSN after which the cursor must start.
* @param dbHandler
* The associated DbHandler.
* @throws ChangelogException
* if a database problem happened.
*/
- public JEReplicaDBCursor(ReplicationDB db, ChangeNumber startAfterCN,
+ public JEReplicaDBCursor(ReplicationDB db, CSN startAfterCSN,
DbHandler dbHandler) throws ChangelogException
{
this.db = db;
this.dbHandler = dbHandler;
- this.lastNonNullCurrentCN = startAfterCN;
+ this.lastNonNullCurrentCSN = startAfterCSN;
try
{
- cursor = db.openReadCursor(startAfterCN);
+ cursor = db.openReadCursor(startAfterCSN);
}
catch(Exception e)
{
@@ -81,7 +81,7 @@
dbHandler.flush();
// look again in the db
- cursor = db.openReadCursor(startAfterCN);
+ cursor = db.openReadCursor(startAfterCSN);
if (cursor == null)
{
throw new ChangelogException(Message.raw("no new change"));
@@ -104,7 +104,7 @@
if (currentChange != null)
{
- lastNonNullCurrentCN = currentChange.getChangeNumber();
+ lastNonNullCurrentCSN = currentChange.getCSN();
}
else
{
@@ -118,11 +118,11 @@
dbHandler.flush();
try
{
- cursor = db.openReadCursor(lastNonNullCurrentCN);
+ cursor = db.openReadCursor(lastNonNullCurrentCSN);
currentChange = cursor.next();
if (currentChange != null)
{
- lastNonNullCurrentCN = currentChange.getChangeNumber();
+ lastNonNullCurrentCSN = currentChange.getCSN();
}
}
catch(Exception e)
--
Gitblit v1.10.0