From 0a9135e3444bbefde6188f456b9c9772a816096d Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Sep 2013 15:17:14 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandler.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandler.java b/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandler.java
index a070ac2..3462514 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandler.java
@@ -46,10 +46,7 @@
import org.opends.server.replication.server.ReplicationServerDomain;
import org.opends.server.replication.server.changelog.api.*;
import org.opends.server.replication.server.changelog.je.DraftCNDB.*;
-import org.opends.server.types.Attribute;
-import org.opends.server.types.Attributes;
-import org.opends.server.types.DebugLogLevel;
-import org.opends.server.types.InitializationException;
+import org.opends.server.types.*;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
@@ -298,7 +295,7 @@
/** {@inheritDoc} */
@Override
- public void clear(String baseDNToClear) throws ChangelogException
+ public void clear(DN baseDNToClear) throws ChangelogException
{
if (isEmpty())
{
@@ -321,15 +318,14 @@
// From the draftCNDb change record, get the domain and CSN
final CNIndexRecord record = cursor.currentRecord();
- final String baseDN = record.getBaseDN();
- if (baseDNToClear != null && baseDNToClear.equalsIgnoreCase(baseDN))
+ if (baseDNToClear != null && baseDNToClear.equals(record.getBaseDN()))
{
cursor.delete();
continue;
}
final ReplicationServerDomain domain =
- replicationServer.getReplicationServerDomain(baseDN);
+ replicationServer.getReplicationServerDomain(record.getBaseDN());
if (domain == null)
{
// the domain has been removed since the record was written in the
@@ -354,10 +350,10 @@
ServerState csnVector;
try
{
- Map<String, ServerState> csnStartStates =
+ Map<DN, ServerState> csnStartStates =
MultiDomainServerState.splitGenStateToServerStates(
record.getPreviousCookie());
- csnVector = csnStartStates.get(baseDN);
+ csnVector = csnStartStates.get(record.getBaseDN());
if (debugEnabled())
TRACER.debugInfo("DraftCNDBHandler:clear() - ChangeVector:"
@@ -516,7 +512,7 @@
* Takes the lock on this object (blocking until lock can be acquired).
* @throws InterruptedException If interrupted.
*/
- public void lock() throws InterruptedException
+ public void lock() throws InterruptedException
{
lock.lockInterruptibly();
}
--
Gitblit v1.10.0