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/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java | 5 -
opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java | 5 -
opendj3-server-dev/src/server/org/opends/server/types/FilePermission.java | 10 --
opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java | 6 -
opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java | 13 +---
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java | 17 +----
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 5 -
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java | 5 -
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java | 8 --
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java | 18 ++----
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java | 6 -
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java | 3
opendj3-server-dev/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java | 10 --
opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java | 34 +++-------
opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java | 5 -
opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java | 12 ---
opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java | 3
17 files changed, 43 insertions(+), 122 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
index 8ec5fc1..06abb59 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java
@@ -557,10 +557,7 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled())
- {
- logger.traceException(e);
- }
+ logger.traceException(e);
LocalizableMessage message = ERR_TRUSTSTORE_CANNOT_RETRIEVE_CERT.get(
certAlias, trustStoreFile, e.getMessage());
@@ -756,11 +753,7 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled())
- {
- logger.traceException(e);
- }
-
+ logger.traceException(e);
continue;
}
@@ -768,7 +761,6 @@
{
searchOperation.returnEntry(certEntry, null);
}
-
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java
index 12578ad..db37285 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java
@@ -245,10 +245,7 @@
catch(IOException ioe)
{
// TODO: This should never happen with byte buffer.
- if(logger.isTraceEnabled())
- {
- logger.traceException(ioe);
- }
+ logger.traceException(ioe);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
index 5f9fa08..6b7a2df 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
@@ -1056,13 +1056,9 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled())
- {
- logger.traceException(e);
- }
+ logger.traceException(e);
- directoryServer.mBeanServer =
- MBeanServerFactory.newMBeanServer();
+ directoryServer.mBeanServer = MBeanServerFactory.newMBeanServer();
}
directoryServer.mBeans = new ConcurrentHashMap<DN,JMXMBean>();
registerAlertGenerator(directoryServer);
diff --git a/opendj3-server-dev/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java b/opendj3-server-dev/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java
index 5c096e4..53de4ad 100644
--- a/opendj3-server-dev/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java
@@ -131,10 +131,7 @@
}
catch (ASN1Exception ae)
{
- if (logger.isTraceEnabled())
- {
- logger.traceException(ae);
- }
+ logger.traceException(ae);
LocalizableMessage message = ERR_GET_SYMMETRIC_KEY_ASN1_DECODE_EXCEPTION.get(
ae.getMessage());
@@ -143,10 +140,7 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled())
- {
- logger.traceException(e);
- }
+ logger.traceException(e);
operation.setResultCode(ResultCode.PROTOCOL_ERROR);
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;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
index 698886d..d9614f5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java
@@ -786,10 +786,7 @@
* This should never happen as we are processing the post-operation which
* succeeded so the entry has to exist if we have reached this point.
*/
- if (logger.isTraceEnabled())
- {
- logger.traceException(e);
- }
+ logger.traceException(e);
}
return PluginResult.PostOperation.continueOperationProcessing();
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
index 3e8917f..3439a3b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -376,8 +376,7 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled())
- logger.traceException(e);
+ logger.traceException(e);
close(session);
close(socket);
}
@@ -691,10 +690,7 @@
}
catch (ChangelogException ignored)
{
- if (logger.isTraceEnabled())
- {
- logger.traceException(ignored);
- }
+ logger.traceException(ignored);
}
// Remove this instance from the global instance list
@@ -777,8 +773,7 @@
}
catch (ChangelogException e)
{
- if (logger.isTraceEnabled())
- logger.traceException(e);
+ logger.traceException(e);
resultCode = ResultCode.OPERATIONS_ERROR;
}
}
@@ -803,14 +798,12 @@
}
catch (IOException e)
{
- if (logger.isTraceEnabled())
- logger.traceException(e);
+ logger.traceException(e);
logger.error(ERR_COULD_NOT_CLOSE_THE_SOCKET.get(e));
}
catch (InterruptedException e)
{
- if (logger.isTraceEnabled())
- logger.traceException(e);
+ logger.traceException(e);
logger.error(ERR_COULD_NOT_STOP_LISTEN_THREAD.get(e));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
index 864d10f..6386e4f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java
@@ -497,8 +497,7 @@
}
catch (ChangelogException e)
{
- if (logger.isTraceEnabled())
- logger.traceException(e);
+ logger.traceException(e);
}
return 0;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
index 472fd2e..25c5f1b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
@@ -157,8 +157,7 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled())
- logger.traceException(e);
+ logger.traceException(e);
final LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(e.getLocalizedMessage());
@@ -317,8 +316,7 @@
}
catch (ChangelogException e)
{
- if (logger.isTraceEnabled())
- logger.traceException(e);
+ logger.traceException(e);
logger.error(ERR_COULD_NOT_READ_DB.get(this.dbDirectory.getAbsolutePath(),
e.getLocalizedMessage()));
@@ -462,8 +460,7 @@
{
firstException = e;
}
- else if (logger.isTraceEnabled())
- logger.traceException(e);
+ else logger.traceException(e);
}
cnIndexDB = null;
@@ -584,8 +581,7 @@
{
firstException = e;
}
- else if (logger.isTraceEnabled())
- logger.traceException(e);
+ else logger.traceException(e);
}
}
}
@@ -601,8 +597,7 @@
{
firstException = e;
}
- else if (logger.isTraceEnabled())
- logger.traceException(e);
+ else logger.traceException(e);
}
if (firstException != null)
@@ -699,8 +694,7 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled())
- logger.traceException(e);
+ logger.traceException(e);
logger.error(ERR_CHANGENUMBER_DATABASE.get(e.getLocalizedMessage()));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java
index 92541e1..a33cbb3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java
@@ -1232,10 +1232,7 @@
logger.error(errorMessage);
}
- if (logger.isTraceEnabled())
- {
- logger.trace(errorMessage);
- }
+ logger.trace(errorMessage);
}
}
return setConnectedRS(ConnectedRS.noConnectedRS());
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
index f1d3515..cdb27b3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
@@ -193,11 +193,7 @@
catch (CertificateException ce)
{
// There seems to be a problem while parsing the certificate.
- LocalizableMessage message = WARN_CERTIFICATE_MATCH_PARSE_ERROR.get(ce.getMessage());
- if (logger.isTraceEnabled())
- {
- logger.trace(message);
- }
+ logger.trace(WARN_CERTIFICATE_MATCH_PARSE_ERROR.get(ce.getMessage()));
// return the raw bytes as a fall back
return value.toByteString();
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/FilePermission.java b/opendj3-server-dev/src/server/org/opends/server/types/FilePermission.java
index 0799573..859a5eb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/FilePermission.java
+++ b/opendj3-server-dev/src/server/org/opends/server/types/FilePermission.java
@@ -264,17 +264,11 @@
}
catch (NoSuchMethodException e)
{
- if (logger.isTraceEnabled())
- {
- logger.traceException(e);
- }
+ logger.traceException(e);
}
catch (ClassNotFoundException e)
{
- if (logger.isTraceEnabled())
- {
- logger.traceException(e);
- }
+ logger.traceException(e);
}
finally
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
index 8526150..5f4d3a1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
@@ -1322,8 +1322,7 @@
}
rejectWriter.newLine();
} catch (IOException ex) {
- if (logger.isTraceEnabled())
- logger.traceException(ex);
+ logger.traceException(ex);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
index a67bad3..fbfc87c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java
@@ -241,8 +241,7 @@
}
catch (DirectoryException de)
{
- if (logger.isTraceEnabled())
- logger.traceException(de);
+ logger.traceException(de);
setResponseData(de);
break searchProcessing;
}
@@ -254,8 +253,7 @@
}
catch (DirectoryException de)
{
- if (logger.isTraceEnabled())
- logger.traceException(de);
+ logger.traceException(de);
setResponseData(de);
break searchProcessing;
}
@@ -296,9 +294,7 @@
}
catch (DirectoryException de)
{
- if (logger.isTraceEnabled())
- logger.traceException(de);
-
+ logger.traceException(de);
setResponseData(de);
if (persistentSearch != null)
@@ -320,8 +316,7 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled())
- logger.traceException(e);
+ logger.traceException(e);
setResultCode(DirectoryServer.getServerErrorResultCode());
appendErrorMessage(ERR_SEARCH_BACKEND_EXCEPTION.get(
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
index db347b0..6e16613 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java
@@ -272,11 +272,7 @@
}
catch (DirectoryException de)
{
- if (logger.isTraceEnabled())
- {
- logger.traceException(de);
- }
-
+ logger.traceException(de);
setResponseData(de);
if (persistentSearch != null)
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 36083cd..b06fcc0 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -114,10 +114,7 @@
private void log(String s)
{
logger.error(LocalizableMessage.raw("InitOnLineTests/" + s));
- if (logger.isTraceEnabled())
- {
- logger.trace(s);
- }
+ logger.trace(s);
}
/**
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
index ffec2e7..302404a 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
@@ -54,10 +54,7 @@
private void debugInfo(String s)
{
logger.error(LocalizableMessage.raw(s));
- if (logger.isTraceEnabled())
- {
- logger.trace(s);
- }
+ logger.trace(s);
}
private static final String EXAMPLE_DN = "dc=example,dc=com";
--
Gitblit v1.10.0