From abbdffd7e86953f89c3469bcfc659d842fb785f6 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 09 Oct 2013 14:57:21 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 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 03355df..f189fd1 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
@@ -94,7 +94,7 @@
/** {@inheritDoc} */
@Override
- public boolean next()
+ public boolean next() throws ChangelogException
{
currentChange = cursor.next();
@@ -112,18 +112,11 @@
cursor = null;
}
replicaDB.flush();
- try
+ cursor = db.openReadCursor(lastNonNullCurrentCSN);
+ currentChange = cursor.next();
+ if (currentChange != null)
{
- cursor = db.openReadCursor(lastNonNullCurrentCSN);
- currentChange = cursor.next();
- if (currentChange != null)
- {
- lastNonNullCurrentCSN = currentChange.getCSN();
- }
- }
- catch(Exception e)
- {
- currentChange = null;
+ lastNonNullCurrentCSN = currentChange.getCSN();
}
}
}
--
Gitblit v1.10.0