From 1d5d1a6a4a0a58d6bb4803527dacb6641c027816 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 28 Jan 2014 13:34:12 +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/PasswordModifyExtendedOperation.java | 86 +++++++++----------------------------------
1 files changed, 18 insertions(+), 68 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
index 27e621d..82e975d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
@@ -46,7 +46,7 @@
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.PasswordPolicyState;
import org.opends.server.loggers.ErrorLogger;
-import org.opends.server.loggers.debug.DebugTracer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.asn1.ASN1;
import org.opends.server.protocols.asn1.ASN1Reader;
import org.opends.server.protocols.asn1.ASN1Writer;
@@ -59,7 +59,6 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -110,11 +109,7 @@
CLEAR_PWD_ATTACHMENT = PREFIX + ".CLEAR_PWD";
ENCODED_PWD_ATTACHMENT = PREFIX + ".ENCODED_PWD";
}
-
- /**
- * The tracer object for the debug logger.
- */
- private static final DebugTracer TRACER = getTracer();
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/** The current configuration state. */
private PasswordModifyExtendedOperationHandlerCfg currentConfig;
@@ -170,10 +165,7 @@
}
catch (Exception e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
LocalizableMessage message = ERR_EXTOP_PASSMOD_CANNOT_DETERMINE_ID_MAPPER.get(
String.valueOf(config.dn()), getExceptionMessage(e));
throw new InitializationException(message, e);
@@ -268,10 +260,7 @@
}
catch (Exception ae)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, ae);
- }
+ logger.traceException(ae);
operation.setResultCode(ResultCode.PROTOCOL_ERROR);
operation.appendErrorMessage(ERR_EXTOP_PASSMOD_CANNOT_DECODE_REQUEST
@@ -336,10 +325,7 @@
}
catch (DirectoryException de)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
+ logger.traceException(de);
operation.setResultCode(ResultCode.INVALID_DN_SYNTAX);
operation.appendErrorMessage(
@@ -378,10 +364,7 @@
}
catch (DirectoryException de)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
+ logger.traceException(de);
//Encountered an exception while resolving identity.
operation.setResultCode(de.getResultCode());
@@ -402,10 +385,7 @@
}
catch (DirectoryException ignored)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, ignored);
- }
+ logger.traceException(ignored);
}
if (userDN != null && !userDN.isRootDN()) {
@@ -423,10 +403,7 @@
}
catch (DirectoryException ignored)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, ignored);
- }
+ logger.traceException(ignored);
}
}
@@ -462,10 +439,7 @@
}
catch (DirectoryException de)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
+ logger.traceException(de);
operation.setResultCode(DirectoryServer.getServerErrorResultCode());
operation.appendErrorMessage(
@@ -707,10 +681,7 @@
}
catch (DirectoryException de)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
+ logger.traceException(de);
operation.setResultCode(de.getResultCode());
operation.appendErrorMessage(
@@ -826,10 +797,7 @@
}
catch (DirectoryException de)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
+ logger.traceException(de);
operation.setResultCode(de.getResultCode());
operation.appendErrorMessage(
@@ -881,10 +849,7 @@
}
catch (DirectoryException de)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
+ logger.traceException(de);
// We couldn't decode the provided password value, so remove it
// from the user's entry.
@@ -920,10 +885,7 @@
}
catch (DirectoryException de)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
+ logger.traceException(de);
// We couldn't decode the provided password value, so remove it
// from the user's entry.
@@ -1063,7 +1025,7 @@
}
catch (IOException e)
{
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ logger.traceException(e);
}
operation.setResponseValue(builder.toByteString());
@@ -1185,10 +1147,7 @@
}
catch (DirectoryException de)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
+ logger.traceException(de);
operation.setResultCode(de.getResultCode());
operation.appendErrorMessage(de.getMessageObject());
@@ -1215,10 +1174,7 @@
}
catch (Exception e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
}
return null;
}
@@ -1273,10 +1229,7 @@
}
catch (Exception e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
LocalizableMessage message = ERR_EXTOP_PASSMOD_CANNOT_DETERMINE_ID_MAPPER.get(
String.valueOf(config.dn()),
@@ -1333,10 +1286,7 @@
}
catch (Exception e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
resultCode = DirectoryServer.getServerErrorResultCode();
--
Gitblit v1.10.0