From 8c65bed141924d54847bdc3ba2900dcc6142ec86 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 06 Jun 2014 13:37:22 +0000
Subject: [PATCH] Code cleanup.

---
 opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
index d10ea42..6bf1929 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
@@ -322,26 +322,22 @@
     {
       final String attributeName =
           isFirst ? "first-draft-changenumber" : "last-draft-changenumber";
-      final String changeNumber = String.valueOf(getChangeNumber(isFirst));
+      final String changeNumber = String.valueOf(readChangeNumber(isFirst));
       return Attributes.create(attributeName, changeNumber);
     }
 
-    private long getChangeNumber(boolean isFirst)
+    private long readChangeNumber(boolean isFirst)
     {
       try
       {
-        final ChangeNumberIndexRecord record =
-            isFirst ? db.readFirstRecord() : db.readLastRecord();
-        if (record != null)
-        {
-          return record.getChangeNumber();
-        }
+        return getChangeNumber(
+            isFirst ? db.readFirstRecord() : db.readLastRecord());
       }
       catch (ChangelogException e)
       {
         logger.traceException(e);
+        return NO_KEY;
       }
-      return 0;
     }
 
     /** {@inheritDoc} */

--
Gitblit v1.10.0