From 891159050af4aa3fe47c67e3ba7d3f21299027a4 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 02 Dec 2013 14:01:32 +0000
Subject: [PATCH] OPENDJ-1174 (CR-2631) Transfer responsibility for populating the ChangeNumberIndexDB to ChangelogDB
---
opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java b/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
index cdfbcae..1c7df7e 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
@@ -48,6 +48,7 @@
import static com.sleepycat.je.LockMode.*;
import static com.sleepycat.je.OperationStatus.*;
+import static org.opends.messages.JebMessages.*;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.loggers.debug.DebugLogger.*;
@@ -246,11 +247,12 @@
}
catch (RuntimeException e)
{
- throw new ChangelogException(e);
+ final Message message = ERR_JEB_DATABASE_EXCEPTION.get(e.getMessage());
+ throw new ChangelogException(message, e);
}
catch (DirectoryException e)
{
- throw new ChangelogException(e);
+ throw new ChangelogException(e.getMessageObject(), e);
}
finally
{
@@ -439,7 +441,7 @@
}
catch (DatabaseException e)
{
- logError(newErrorMessage(null, e));
+ logError(closeDBErrorMessage(null, e));
}
}
@@ -452,11 +454,11 @@
}
catch (DatabaseException e)
{
- logError(newErrorMessage(db.getDatabaseName(), e));
+ logError(closeDBErrorMessage(db.getDatabaseName(), e));
}
}
- private Message newErrorMessage(String dbName, DatabaseException e)
+ private Message closeDBErrorMessage(String dbName, DatabaseException e)
{
if (dbName != null)
{
--
Gitblit v1.10.0