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/extensions/ParallelWorkQueue.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java b/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java
index 93fb007..0a8dbd2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java
@@ -30,7 +30,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -170,9 +169,8 @@
{
logger.traceException(e);
- LocalizableMessage message = ERR_CONFIG_WORK_QUEUE_CANNOT_CREATE_MONITOR.get(
- String.valueOf(ParallelWorkQueueMonitor.class), String.valueOf(e));
- logError(message);
+ logger.error(ERR_CONFIG_WORK_QUEUE_CANNOT_CREATE_MONITOR, String
+ .valueOf(ParallelWorkQueueMonitor.class), String.valueOf(e));
}
}
@@ -207,8 +205,7 @@
{
logger.traceException(e);
- logError(WARN_QUEUE_UNABLE_TO_CANCEL.get(
- String.valueOf(o), String.valueOf(e)));
+ logger.warn(WARN_QUEUE_UNABLE_TO_CANCEL.get(String.valueOf(o), String.valueOf(e)));
}
}
@@ -224,8 +221,7 @@
{
logger.traceException(e);
- logError(WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD.get(
- t.getName(), String.valueOf(e)));
+ logger.warn(WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD.get(t.getName(), String.valueOf(e)));
}
}
}
@@ -356,9 +352,8 @@
{
if (numFailures > MAX_RETRY_COUNT)
{
- LocalizableMessage message = ERR_CONFIG_WORK_QUEUE_TOO_MANY_FAILURES.get(
- Thread.currentThread().getName(), numFailures, MAX_RETRY_COUNT);
- logError(message);
+ logger.error(ERR_CONFIG_WORK_QUEUE_TOO_MANY_FAILURES, Thread
+ .currentThread().getName(), numFailures, MAX_RETRY_COUNT);
}
return null;
@@ -422,8 +417,8 @@
// This should not happen. The only recourse we have is to log a message
// and try again.
- logError(WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION.get(
- Thread.currentThread().getName(), String.valueOf(e)));
+ logger.warn(WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION.get(Thread
+ .currentThread().getName(), String.valueOf(e)));
return retryNextOperation(workerThread, numFailures + 1);
}
}
--
Gitblit v1.10.0