From a06fd90c9b6bfb5f9130146373ba18e5769593b6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 29 Jan 2014 11:30:37 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
index 687912c..5b866d0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java
@@ -27,12 +27,12 @@
package org.opends.server.replication.server.changelog.je;
import java.io.Closeable;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.UpdateMsg;
@@ -48,7 +48,6 @@
import static com.sleepycat.je.OperationStatus.*;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -60,6 +59,9 @@
public class ReplicationDB
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
+
private Database db;
private ReplicationDbEnv dbenv;
private ReplicationServer replicationServer;
@@ -267,7 +269,7 @@
}
catch (DatabaseException e)
{
- logError(NOTE_EXCEPTION_CLOSING_DATABASE.get(toString(),
+ logger.info(NOTE_EXCEPTION_CLOSING_DATABASE.get(toString(),
stackTraceToSingleLineString(e)));
}
finally
@@ -805,11 +807,9 @@
* changes.
* TODO : This should be handled by the repair functionality.
*/
- LocalizableMessage message = ERR_REPLICATIONDB_CANNOT_PROCESS_CHANGE_RECORD
- .get(replicationServer.getServerId(),
+ logger.error(ERR_REPLICATIONDB_CANNOT_PROCESS_CHANGE_RECORD, replicationServer.getServerId(),
(csn == null ? "" : csn.toString()),
e.getMessage());
- logError(message);
}
}
return currentChange;
@@ -870,7 +870,7 @@
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(ERR_ERROR_CLEARING_DB.get(toString(),
e.getMessage() + " " + stackTraceToSingleLineString(e)));
- logError(mb.toMessage());
+ logger.error(mb.toMessage());
}
finally
{
--
Gitblit v1.10.0