From e3add78e22e130ef6ece000a7989f4f4317d4da8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 04 Oct 2013 14:03:02 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 7b98f6b..f2ecd4d 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
@@ -40,7 +40,7 @@
{
private UpdateMsg currentChange;
private ReplServerDBCursor cursor;
- private DbHandler dbHandler;
+ private JEReplicaDB replicaDB;
private ReplicationDB db;
private CSN lastNonNullCurrentCSN;
@@ -53,16 +53,16 @@
* @param startAfterCSN
* The CSN after which the cursor must start.If null, start from the
* oldest CSN
- * @param dbHandler
- * The associated DbHandler.
+ * @param replicaDB
+ * The associated JEReplicaDB.
* @throws ChangelogException
* if a database problem happened.
*/
public JEReplicaDBCursor(ReplicationDB db, CSN startAfterCSN,
- DbHandler dbHandler) throws ChangelogException
+ JEReplicaDB replicaDB) throws ChangelogException
{
this.db = db;
- this.dbHandler = dbHandler;
+ this.replicaDB = replicaDB;
this.lastNonNullCurrentCSN = startAfterCSN;
try
@@ -78,7 +78,7 @@
if (cursor == null)
{
// flush the queue into the db
- dbHandler.flush();
+ replicaDB.flush();
// look again in the db
cursor = db.openReadCursor(startAfterCSN);
@@ -111,7 +111,7 @@
cursor.close();
cursor = null;
}
- dbHandler.flush();
+ replicaDB.flush();
try
{
cursor = db.openReadCursor(lastNonNullCurrentCSN);
@@ -141,7 +141,7 @@
cursor.close();
cursor = null;
}
- this.dbHandler = null;
+ this.replicaDB = null;
this.db = null;
}
}
--
Gitblit v1.10.0