From 68f9a86c43271c3b02daeb6923d417bfaa83358b Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 29 Jan 2014 14:38:28 +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/api/AuthenticationPolicy.java | 36 ++++++++++++++----------------------
1 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java b/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
index 6c99f7b..6db9ff7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
@@ -96,25 +96,22 @@
}
catch (Exception e)
{
- logger.trace(e.getMessage(), e);
+ logger.traceException(e);
- if (logger.isTraceEnabled())
- {
- logger.trace("Could not parse password policy subentry "
- + "DN %s for user %s", v.getValue(),
- userDNString, e);
- }
+ logger.trace(
+ "Could not parse password policy subentry DN %s for user %s", v
+ .getValue(), userDNString, e);
if (useDefaultOnError)
{
logger.error(ERR_PWPSTATE_CANNOT_DECODE_SUBENTRY_VALUE_AS_DN,
- v.getValue().toString(), userDNString, e.getMessage());
+ v.getValue(), userDNString, e.getMessage());
return DirectoryServer.getDefaultPasswordPolicy();
}
else
{
LocalizableMessage message = ERR_PWPSTATE_CANNOT_DECODE_SUBENTRY_VALUE_AS_DN
- .get(v.getValue().toString(), userDNString, e.getMessage());
+ .get(v.getValue(), userDNString, e.getMessage());
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message,
e);
}
@@ -124,12 +121,10 @@
.getAuthenticationPolicy(subentryDN);
if (policy == null)
{
- logger.trace("Password policy subentry %s for user %s "
- + "is not defined in the Directory Server.",
- subentryDN, userDNString);
+ logger.trace("Password policy subentry %s for user %s is not defined in the Directory Server.",
+ subentryDN, userDNString);
- LocalizableMessage message = ERR_PWPSTATE_NO_SUCH_POLICY.get(userDNString,
- String.valueOf(subentryDN));
+ LocalizableMessage message = ERR_PWPSTATE_NO_SUCH_POLICY.get(userDNString, subentryDN);
if (useDefaultOnError)
{
logger.error(message);
@@ -167,9 +162,8 @@
{
// This shouldn't happen but if it does debug log
// this problem and fall back to default policy.
- logger.trace("Found unknown password policy subentry "
- + "DN %s for user %s", subentry.getDN(),
- userDNString);
+ logger.trace("Found unknown password policy subentry DN %s for user %s",
+ subentry.getDN(), userDNString);
break;
}
return policy;
@@ -178,17 +172,15 @@
catch (Exception e)
{
if (logger.isTraceEnabled()) {
- logger.trace("Could not parse password policy subentry "
- + "DN %s for user %s: %s", subentry.getDN(),
- userDNString, stackTraceToSingleLineString(e));
+ logger.trace("Could not parse password policy subentry DN %s for user %s: %s",
+ subentry.getDN(), userDNString, stackTraceToSingleLineString(e));
}
}
}
}
// No authentication policy found, so use the global default.
- logger.trace("Using the default password policy for user %s",
- userDNString);
+ logger.trace("Using the default password policy for user %s", userDNString);
return DirectoryServer.getDefaultPasswordPolicy();
}
--
Gitblit v1.10.0