From bef73d94160ab49b47eed6d8fa17f0532d182b07 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 23 May 2014 14:27:18 +0000
Subject: [PATCH] Code cleanup.

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

diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java b/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
index fcf0ad4..0fb02a5 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
@@ -128,7 +128,9 @@
     newestChangeNumber = changeNumber;
 
     if (debugEnabled())
+    {
       TRACER.debugInfo("In JEChangeNumberIndexDB.add, added: " + newRecord);
+    }
     return changeNumber;
   }
 
@@ -328,27 +330,25 @@
     {
       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)
       {
         if (debugEnabled())
+        {
           TRACER.debugCaught(DebugLogLevel.WARNING, e);
+        }
+        return NO_KEY;
       }
-      return 0;
     }
 
     /** {@inheritDoc} */

--
Gitblit v1.10.0