From 5d7be546948d1d019e3d29932b222d69412643dd Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 01 Jul 2014 15:23:25 +0000
Subject: [PATCH] Code cleanups.
---
opends/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBCursor.java | 19 ++++++++-----------
1 files changed, 8 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 27b0175..d5ed710 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
@@ -30,7 +30,7 @@
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.DBCursor;
-import org.opends.server.replication.server.changelog.je.ReplicationDB.*;
+import org.opends.server.replication.server.changelog.je.ReplicationDB.ReplServerDBCursor;
/**
* Berkeley DB JE implementation of {@link DBCursor}.
@@ -89,11 +89,7 @@
final ReplServerDBCursor localCursor = cursor;
currentChange = localCursor != null ? localCursor.next() : null;
- if (currentChange != null)
- {
- lastNonNullCurrentCSN = currentChange.getCSN();
- }
- else
+ if (currentChange == null)
{
synchronized (this)
{
@@ -105,13 +101,14 @@
// and fixing such issue with unit tests.
cursor = db.openReadCursor(lastNonNullCurrentCSN);
currentChange = cursor.next();
- if (currentChange != null)
- {
- lastNonNullCurrentCSN = currentChange.getCSN();
- }
}
}
- return currentChange != null;
+ if (currentChange != null)
+ {
+ lastNonNullCurrentCSN = currentChange.getCSN();
+ return true;
+ }
+ return false;
}
/** {@inheritDoc} */
--
Gitblit v1.10.0