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/file/FileChangeNumberIndexDB.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java b/opends/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java
index 9a91ff9..c0e36e8 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/file/FileChangeNumberIndexDB.java
@@ -265,19 +265,15 @@
private Attribute createChangeNumberAttribute(final boolean isFirst)
{
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(final boolean isFirst)
+ private long readChangeNumber(final boolean isFirst)
{
try
{
- final ChangeNumberIndexRecord record = isFirst ? readFirstRecord() : readLastRecord();
- if (record != null)
- {
- return record.getChangeNumber();
- }
+ return getChangeNumber(isFirst ? readFirstRecord() : readLastRecord());
}
catch (ChangelogException e)
{
@@ -285,8 +281,8 @@
{
TRACER.debugCaught(DebugLogLevel.WARNING, e);
}
+ return NO_KEY;
}
- return 0;
}
/** {@inheritDoc} */
--
Gitblit v1.10.0