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/tasks/TaskUtils.java | 33 ++++++++-------------------------
1 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java b/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java
index 0dcb46d..90e0cda 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java
@@ -31,7 +31,6 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
import org.opends.server.util.ServerConstants;
@@ -91,16 +90,12 @@
}
catch (ConfigException ce)
{
- LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(
- String.valueOf(configEntry.getDN()), ce.getMessage());
- logError(message);
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry.getDN()), ce.getMessage());
return null;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(
- String.valueOf(configEntry.getDN()), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry.getDN()), getExceptionMessage(e));
return null;
}
}
@@ -124,16 +119,12 @@
}
catch (DirectoryException de)
{
- LocalizableMessage message = ERR_CANNOT_DECODE_BACKEND_BASE_DN.get(
- DN_BACKEND_BASE, de.getMessageObject());
- logError(message);
+ logger.error(ERR_CANNOT_DECODE_BACKEND_BASE_DN, DN_BACKEND_BASE, de.getMessageObject());
return configEntries;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_CANNOT_DECODE_BACKEND_BASE_DN.get(
- DN_BACKEND_BASE, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_CANNOT_DECODE_BACKEND_BASE_DN, DN_BACKEND_BASE, getExceptionMessage(e));
return configEntries;
}
@@ -144,16 +135,12 @@
}
catch (ConfigException ce)
{
- LocalizableMessage message = ERR_CANNOT_RETRIEVE_BACKEND_BASE_ENTRY.get(
- DN_BACKEND_BASE, ce.getMessage());
- logError(message);
+ logger.error(ERR_CANNOT_RETRIEVE_BACKEND_BASE_ENTRY, DN_BACKEND_BASE, ce.getMessage());
return configEntries;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_CANNOT_RETRIEVE_BACKEND_BASE_ENTRY.get(
- DN_BACKEND_BASE, getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_CANNOT_RETRIEVE_BACKEND_BASE_ENTRY, DN_BACKEND_BASE, getExceptionMessage(e));
return configEntries;
}
@@ -186,16 +173,12 @@
}
catch (ConfigException ce)
{
- LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(
- String.valueOf(configEntry.getDN()), ce.getMessage());
- logError(message);
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry.getDN()), ce.getMessage());
continue;
}
catch (Exception e)
{
- LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(
- String.valueOf(configEntry.getDN()), getExceptionMessage(e));
- logError(message);
+ logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry.getDN()), getExceptionMessage(e));
continue;
}
--
Gitblit v1.10.0