From adf6f5da58af4947ce7ba6f6ee0bcc19725c5a6c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 31 Jan 2014 15:12:55 +0000
Subject: [PATCH] Fixed logger usage: - From: if (logger.isTraceEnabled()) logger.traceException(e); To: logger.traceException(e); - From: if (logger.isTraceEnabled()) { logger.trace(message); } To: logger.trace(message);
---
opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
index be87fbe..e5b7677 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -381,8 +381,7 @@
saslContext = SASLContext.createSASLContext(saslProps, serverFQDN,
SASL_MECHANISM_GSSAPI, identityMapper);
} catch (SaslException ex) {
- if (logger.isTraceEnabled())
- logger.traceException(ex);
+ logger.traceException(ex);
LocalizableMessage msg;
GSSException gex = (GSSException) ex.getCause();
if(gex != null) {
@@ -404,8 +403,7 @@
}
catch (LoginException ex)
{
- if (logger.isTraceEnabled())
- logger.traceException(ex);
+ logger.traceException(ex);
LocalizableMessage message = ERR_SASLGSSAPI_CANNOT_CREATE_LOGIN_CONTEXT
.get(getExceptionMessage(ex));
// Log a configuration error.
@@ -489,11 +487,9 @@
}
catch (UnknownHostException ex)
{
- if (logger.isTraceEnabled())
- logger.traceException(ex);
- LocalizableMessage message = ERR_SASL_CANNOT_GET_SERVER_FQDN.get(String
- .valueOf(configEntryDN), getExceptionMessage(ex));
- unacceptableReasons.add(message);
+ logger.traceException(ex);
+ unacceptableReasons.add(ERR_SASL_CANNOT_GET_SERVER_FQDN.get(
+ configEntryDN, getExceptionMessage(ex)));
isAcceptable = false;
}
@@ -543,26 +539,18 @@
this.configuration = newConfiguration;
}
catch (InitializationException ex) {
- if (logger.isTraceEnabled())
- logger.traceException(ex);
- LocalizableMessage message = ex.getMessageObject();
- messages.add(message);
+ logger.traceException(ex);
+ messages.add(ex.getMessageObject());
clearProperties();
resultCode = ResultCode.OTHER;
} catch (UnknownHostException ex) {
- if (logger.isTraceEnabled())
- logger.traceException(ex);
- LocalizableMessage message = ERR_SASL_CANNOT_GET_SERVER_FQDN.get(String
- .valueOf(configEntryDN), getExceptionMessage(ex));
- messages.add(message);
+ logger.traceException(ex);
+ messages.add(ERR_SASL_CANNOT_GET_SERVER_FQDN.get(configEntryDN, getExceptionMessage(ex)));
clearProperties();
resultCode = ResultCode.OTHER;
} catch (IOException ex) {
- if (logger.isTraceEnabled())
- logger.traceException(ex);
- LocalizableMessage message = ERR_SASLGSSAPI_CANNOT_CREATE_JAAS_CONFIG
- .get(getExceptionMessage(ex));
- messages.add(message);
+ logger.traceException(ex);
+ messages.add(ERR_SASLGSSAPI_CANNOT_CREATE_JAAS_CONFIG.get(getExceptionMessage(ex)));
clearProperties();
resultCode = ResultCode.OTHER;
}
--
Gitblit v1.10.0