From d2bbac5c73611fbf1d2c9a767e1b9ad910996747 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 31 Jan 2014 08:45:55 +0000
Subject: [PATCH] Removed calls to toString() when calling a logger method. Also removed funny things like this: LocalizableMessage msg = ...; logger.debug(LocalizableMessage.raw(msg.toString()));
---
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java | 2
opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java | 5
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java | 5
opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java | 15 +--
opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java | 3
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java | 3
opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java | 6 -
opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java | 6 -
opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java | 2
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Launcher.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java | 2
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/FileManager.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java | 8 +-
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java | 5
opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java | 2
opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/FileManager.java | 16 +--
opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java | 4
opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java | 2
opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java | 8 +-
opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java | 4
opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java | 2
opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java | 12 +-
opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java | 2
opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java | 6
opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java | 5
opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java | 4
50 files changed, 87 insertions(+), 107 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
index 19e096a..1813fd1 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
@@ -206,7 +206,7 @@
buf.append("Root cause:\n");
}
}
- logger.warn(LocalizableMessage.raw(buf.toString()));
+ logger.warn(LocalizableMessage.raw(buf));
}
}
}
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
index 0179cdb..e4ce335 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -1557,7 +1557,7 @@
private void printErrorMessage(LocalizableMessage msg)
{
super.println(msg);
- logger.warn(LocalizableMessage.raw(msg.toString()));
+ logger.warn(LocalizableMessage.raw(msg));
}
/**
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Launcher.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Launcher.java
index c59afcf..bfc72fe 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Launcher.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Launcher.java
@@ -227,7 +227,7 @@
buf.append("Root cause:\n");
}
}
- logger.warn(LocalizableMessage.raw(buf.toString()));
+ logger.warn(LocalizableMessage.raw(buf));
}
}
}
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/FileManager.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/FileManager.java
index c1d99fc..a692351 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/FileManager.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/FileManager.java
@@ -386,7 +386,7 @@
application.notifyListeners(application.getFormattedWarning(
INFO_FILE_DOES_NOT_EXIST.get(String.valueOf(file))));
}
- logger.debug(LocalizableMessage.raw("file '" + file.toString() + "' does not exist"));
+ logger.debug(LocalizableMessage.raw("file '" + file + "' does not exist"));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
index 860f72d..d84f049 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
+++ b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java
@@ -451,7 +451,7 @@
//This should never happen since only a copy of the
//ACI with a new DN is being made. Log a message if it does and
//keep going.
- logger.warn(WARN_ACI_ADD_LIST_FAILED_DECODE, aci.toString(), String.valueOf(relocateDN), ex.getMessage());
+ logger.warn(WARN_ACI_ADD_LIST_FAILED_DECODE, aci, String.valueOf(relocateDN), ex.getMessage());
}
}
tempAciList.put(relocateDN, acis);
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
index b5a06ba..b46398c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
@@ -4426,11 +4426,11 @@
}
catch (DirectoryException de)
{
- logger.info(NOTE_SCHEMA_IMPORT_FAILED, attrType.toString(), de.getMessage());
+ logger.info(NOTE_SCHEMA_IMPORT_FAILED, attrType, de.getMessage());
}
catch (Exception e)
{
- logger.info(NOTE_SCHEMA_IMPORT_FAILED, attrType.toString(), e.getMessage());
+ logger.info(NOTE_SCHEMA_IMPORT_FAILED, attrType, e.getMessage());
}
}
}
@@ -4539,11 +4539,11 @@
}
catch (DirectoryException de)
{
- logger.info(NOTE_SCHEMA_IMPORT_FAILED, newObjectClass.toString(), de.getMessage());
+ logger.info(NOTE_SCHEMA_IMPORT_FAILED, newObjectClass, de.getMessage());
}
catch (Exception e)
{
- logger.info(NOTE_SCHEMA_IMPORT_FAILED, newObjectClass.toString(), e.getMessage());
+ logger.info(NOTE_SCHEMA_IMPORT_FAILED, newObjectClass, e.getMessage());
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
index 17aa335..eed381d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
@@ -193,13 +193,13 @@
{
if(!FilePermission.setPermissions(backendDirectory, backendPermission))
{
- logger.warn(WARN_JEB_UNABLE_SET_PERMISSIONS, backendPermission.toString(), backendDirectory.toString());
+ logger.warn(WARN_JEB_UNABLE_SET_PERMISSIONS, backendPermission, backendDirectory);
}
}
catch(Exception e)
{
// Log an warning that the permissions were not set.
- logger.warn(WARN_JEB_SET_PERMISSIONS_FAILED, backendDirectory.toString(), e.toString());
+ logger.warn(WARN_JEB_SET_PERMISSIONS_FAILED, backendDirectory, e);
}
}
@@ -668,6 +668,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isConfigurationChangeAcceptable(
LocalDBBackendCfg cfg,
List<LocalizableMessage> unacceptableReasons)
@@ -744,6 +745,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ConfigChangeResult applyConfigurationChange(LocalDBBackendCfg cfg)
{
ConfigChangeResult ccr;
@@ -822,10 +824,7 @@
// properties that are mutable at runtime.
env.setMutableConfig(newEnvConfig);
- if (logger.isTraceEnabled())
- {
- logger.trace(env.getConfig().toString());
- }
+ logger.trace("JE database configuration: %s", env.getConfig());
}
// Create the directory if it doesn't exist.
@@ -912,13 +911,13 @@
if(!FilePermission.setPermissions(backendDirectory,
backendPermission))
{
- logger.warn(WARN_JEB_UNABLE_SET_PERMISSIONS, backendPermission.toString(), backendDirectory.toString());
+ logger.warn(WARN_JEB_UNABLE_SET_PERMISSIONS, backendPermission, backendDirectory);
}
}
catch(Exception e)
{
// Log an warning that the permissions were not set.
- logger.warn(WARN_JEB_SET_PERMISSIONS_FAILED, backendDirectory.toString(), e.toString());
+ logger.warn(WARN_JEB_SET_PERMISSIONS_FAILED, backendDirectory, e);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
index bbf1af8..97870ae 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -405,7 +405,7 @@
medianValue = values[x];
}
- logger.debug(INFO_JEB_VERIFY_ENTRY_LIMIT_STATS_ROW, index.toString(), values.length, values[0],
+ logger.debug(INFO_JEB_VERIFY_ENTRY_LIMIT_STATS_ROW, index, values.length, values[0],
values[values.length-1], medianValue);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java b/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
index eca4345..62f9486 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java
@@ -159,7 +159,7 @@
{
logger.traceException(e);
- logger.error(ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN, configEntryDN.toString(), String.valueOf(e));
+ logger.error(ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN, configEntryDN, String.valueOf(e));
}
return nameStr ;
}
@@ -194,19 +194,19 @@
{
mBeanServer.unregisterMBean(objectName);
}
- } catch(Exception e)
+ }
+ catch(Exception e)
{
logger.traceException(e);
}
mBeanServer.registerMBean(this, objectName);
- } catch (Exception e)
+ }
+ catch (Exception e)
{
logger.traceException(e);
- e.printStackTrace();
-
- logger.error(ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN, configEntryDN.toString(), String.valueOf(e));
+ logger.error(ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN, configEntryDN, String.valueOf(e));
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java
index 92f7214..73c475a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java
@@ -291,8 +291,7 @@
}
catch(Exception e)
{
- logger.error(ERR_DISK_SPACE_MONITOR_UPDATE_FAILED.get(directory.getPath(), e.toString()));
-
+ logger.error(ERR_DISK_SPACE_MONITOR_UPDATE_FAILED.get(directory.getPath(), e));
logger.traceException(e);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java b/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java
index 97029b9..0fd4613 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java
@@ -157,10 +157,8 @@
catch (DirectoryException de)
{
logger.traceException(de);
-
- logger.error(ERR_DYNAMICGROUP_CANNOT_DECODE_MEMBERURL, v.getValue().toString(),
- String.valueOf(groupEntry.getName()),
- de.getMessageObject());
+ logger.error(ERR_DYNAMICGROUP_CANNOT_DECODE_MEMBERURL, v.getValue(),
+ String.valueOf(groupEntry.getName()), de.getMessageObject());
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
index 7e7a397..a7f6c22 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
@@ -131,7 +131,7 @@
Backend b = DirectoryServer.getBackend(baseDN);
if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
{
- logger.warn(WARN_SATUACM_ATTR_UNINDEXED, configuration.dn().toString(),
+ logger.warn(WARN_SATUACM_ATTR_UNINDEXED, configuration.dn(),
t.getNameOrOID(), b.getBackendID());
}
}
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 30dcf36..86e971c 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
@@ -508,8 +508,7 @@
if(!keyTabFile.exists()) {
LocalizableMessage message = ERR_SASL_GSSAPI_KEYTAB_INVALID.get(keyTabFilePath);
unacceptableReasons.add(message);
- if (logger.isTraceEnabled())
- logger.trace(message.toString());
+ logger.trace(message);
isAcceptable = false;
}
@@ -520,8 +519,7 @@
{
LocalizableMessage message = ERR_SASLGSSAPI_KDC_REALM_NOT_DEFINED.get();
unacceptableReasons.add(message);
- if (logger.isTraceEnabled())
- logger.trace(message.toString());
+ logger.trace(message);
isAcceptable = false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
index 8f44752..566d5be 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
@@ -256,7 +256,7 @@
{
logger.traceException(e);
- logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(storedPassword.toString(), String.valueOf(e)));
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(storedPassword, String.valueOf(e)));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
index 6d6e83c..0acb30e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
@@ -271,7 +271,7 @@
saltLength = decodedBytes.length - SHA1_LENGTH;
if (saltLength <= 0)
{
- logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword.toString());
+ logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword);
return false;
}
saltBytes = new byte[saltLength];
@@ -282,8 +282,7 @@
catch (Exception e)
{
logger.traceException(e);
-
- logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword.toString(), String.valueOf(e));
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, String.valueOf(e));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
index 044f7a4..e73df01 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
@@ -253,9 +253,7 @@
catch (Exception e)
{
logger.traceException(e);
-
- logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(storedPassword.toString(), String.valueOf(e)));
-
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(storedPassword, String.valueOf(e)));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
index 0f00b36..4a37d6f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
@@ -655,7 +655,7 @@
message.setBody(messageBody);
if (logger.isTraceEnabled())
{
- logger.trace("Set message body of " + messageBody.toString());
+ logger.trace("Set message body of " + messageBody);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
index 85157eb..56a02e5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
@@ -100,7 +100,6 @@
public SaltedMD5PasswordStorageScheme()
{
super();
-
}
@@ -281,8 +280,7 @@
catch (Exception e)
{
logger.traceException(e);
-
- logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword.toString(), String.valueOf(e));
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, String.valueOf(e));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
index 66ca661..e0f1811 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
@@ -276,7 +276,7 @@
saltLength = decodedBytes.length - SHA1_LENGTH;
if (saltLength <= 0)
{
- logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword.toString());
+ logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword);
return false;
}
saltBytes = new byte[saltLength];
@@ -287,8 +287,7 @@
catch (Exception e)
{
logger.traceException(e);
-
- logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword.toString(), String.valueOf(e));
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, String.valueOf(e));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
index 6b4f8c9..d5c159d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
@@ -280,7 +280,7 @@
saltLength = decodedBytes.length - SHA256_LENGTH;
if (saltLength <= 0)
{
- logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword.toString());
+ logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword);
return false;
}
saltBytes = new byte[saltLength];
@@ -291,8 +291,7 @@
catch (Exception e)
{
logger.traceException(e);
-
- logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword.toString(), String.valueOf(e));
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, String.valueOf(e));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
index f6ed02c..ef4fb3d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
@@ -281,7 +281,7 @@
saltLength = decodedBytes.length - SHA384_LENGTH;
if (saltLength <= 0)
{
- logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword.toString());
+ logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword);
return false;
}
saltBytes = new byte[saltLength];
@@ -292,8 +292,7 @@
catch (Exception e)
{
logger.traceException(e);
-
- logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword.toString(), String.valueOf(e));
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, String.valueOf(e));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
index fc2ea8e..190cde6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
@@ -280,7 +280,7 @@
saltLength = decodedBytes.length - SHA512_LENGTH;
if (saltLength <= 0)
{
- logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword.toString());
+ logger.error(ERR_PWSCHEME_INVALID_BASE64_DECODED_STORED_PASSWORD, storedPassword);
return false;
}
saltBytes = new byte[saltLength];
@@ -291,8 +291,7 @@
catch (Exception e)
{
logger.traceException(e);
-
- logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword.toString(), String.valueOf(e));
+ logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, String.valueOf(e));
return false;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
index 0f2379b..5388e0e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
@@ -249,7 +249,7 @@
{
logger.traceException(de);
- logger.error(ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN, v.getValue().toString(),
+ logger.error(ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN, v.getValue(),
someMemberAttributeType.getNameOrOID(),
String.valueOf(groupEntry.getName()),
de.getMessageObject());
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
index c5ce49b..18061e3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
@@ -177,7 +177,7 @@
Backend b = DirectoryServer.getBackend(baseDN);
if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
{
- logger.warn(WARN_SATUACM_ATTR_UNINDEXED, configuration.dn().toString(),
+ logger.warn(WARN_SATUACM_ATTR_UNINDEXED, configuration.dn(),
t.getNameOrOID(), b.getBackendID());
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index 0d117af..e1a2676 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -117,7 +117,7 @@
Backend b = DirectoryServer.getBackend(baseDN);
if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
{
- logger.warn(WARN_SATUACM_ATTR_UNINDEXED, configuration.dn().toString(),
+ logger.warn(WARN_SATUACM_ATTR_UNINDEXED, configuration.dn(),
t.getNameOrOID(), b.getBackendID());
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java b/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
index c63b438..fee3413 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
@@ -196,13 +196,13 @@
{
if(!FilePermission.setPermissions(file, filePermissions))
{
- logger.warn(WARN_LOGGER_UNABLE_SET_PERMISSIONS, filePermissions.toString(), file.toString());
+ logger.warn(WARN_LOGGER_UNABLE_SET_PERMISSIONS, filePermissions, file);
}
}
catch(Exception e)
{
// Log an warning that the permissions were not set.
- logger.warn(WARN_LOGGER_SET_PERMISSION_FAILED, file.toString(), stackTraceToSingleLineString(e));
+ logger.warn(WARN_LOGGER_SET_PERMISSION_FAILED, file, stackTraceToSingleLineString(e));
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index d030588..60cee56 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -715,7 +715,7 @@
break;
case NO_SUCH_OBJECT:
- logger.debug(INFO_PLUGIN_REFERENT_SEARCH_NO_SUCH_OBJECT.get(baseDN.toString()));
+ logger.debug(INFO_PLUGIN_REFERENT_SEARCH_NO_SUCH_OBJECT.get(baseDN));
return;
default:
@@ -815,7 +815,7 @@
conn.processModify(entryDN, mods);
if(modifyOperation.getResultCode() != ResultCode.SUCCESS)
{
- logger.error(ERR_PLUGIN_REFERENT_MODIFY_FAILED.get(entryDN.toString(),
+ logger.error(ERR_PLUGIN_REFERENT_MODIFY_FAILED.get(entryDN,
String.valueOf(modifyOperation.getErrorMessage())));
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
index d634cfe..db121c1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -755,8 +755,8 @@
// This must mean that the operation has either not yet completed
// or that it completed without a result for some reason. In any
// case, log a message and set the response to "operations error".
- logger.error(ERR_LDAP_CLIENT_SEND_RESPONSE_NO_RESULT_CODE.get(operation.getOperationType().toString(), operation
- .getConnectionID(), operation.getOperationID()));
+ logger.error(ERR_LDAP_CLIENT_SEND_RESPONSE_NO_RESULT_CODE.get(operation.getOperationType(),
+ operation.getConnectionID(), operation.getOperationID()));
resultCode = DirectoryServer.getServerErrorResultCode();
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java
index 319d52f..ad7d95e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/EntryHistorical.java
@@ -725,7 +725,7 @@
// Any exception happening here means that the coding of the historical
// information was wrong.
// Log an error and continue with an empty historical.
- logger.error(ERR_BAD_HISTORICAL, entry.getName().toString());
+ logger.error(ERR_BAD_HISTORICAL, entry.getName());
}
/* set the reference to the historical information in the entry */
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index d543a2d..75a67e6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -2034,7 +2034,7 @@
* It should never happen.
*/
pendingChanges.remove(curCSN);
- logger.error(ERR_UNKNOWN_TYPE.get(op.getOperationType().toString()));
+ logger.error(ERR_UNKNOWN_TYPE.get(op.getOperationType()));
return;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
index f7fa340..fa9dc50 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -197,7 +197,7 @@
}
catch (ConfigException e)
{
- logger.error(ERR_COULD_NOT_START_REPLICATION.get(configuration.dn().toString(), e.getLocalizedMessage()
+ logger.error(ERR_COULD_NOT_START_REPLICATION.get(configuration.dn(), e.getLocalizedMessage()
+ " " + stackTraceToSingleLineString(e)));
}
return null;
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
index ae2317d..5b39c0d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
@@ -192,7 +192,7 @@
if (((search.getResultCode() != ResultCode.SUCCESS)) &&
((search.getResultCode() != ResultCode.NO_SUCH_OBJECT)))
{
- logger.error(ERR_ERROR_SEARCHING_RUV, search.getResultCode().getResultCodeName(), search.toString(),
+ logger.error(ERR_ERROR_SEARCHING_RUV, search.getResultCode().getResultCodeName(), search,
search.getErrorMessage(), baseDn.toString());
return null;
}
@@ -336,7 +336,7 @@
op.run();
if (op.getResultCode() != ResultCode.SUCCESS)
{
- logger.trace(DEBUG_ERROR_UPDATING_RUV, op.getResultCode().getResultCodeName().toString(),
+ logger.trace(DEBUG_ERROR_UPDATING_RUV, op.getResultCode().getResultCodeName(),
op.toString(),
op.getErrorMessage().toString(),
baseDn.toString());
@@ -435,7 +435,7 @@
// Update the serverState with the new maxCsn
// present in the database
this.update(dbMaxCsn);
- logger.info(NOTE_SERVER_STATE_RECOVERY, baseDn.toNormalizedString(), dbMaxCsn.toString());
+ logger.info(NOTE_SERVER_STATE_RECOVERY, baseDn.toNormalizedString(), dbMaxCsn);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java
index f39b20d..c9ff6d1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java
@@ -70,7 +70,7 @@
this.creationTime = System.currentTimeMillis();
if (logger.isTraceEnabled())
- logger.trace(" Creating error message" + this.toString()
+ logger.trace(" Creating error message" + this
+ " " + stackTraceToSingleLineString(new Exception("trace")));
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
index 3454011..64f5486 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
@@ -262,7 +262,7 @@
{
// This is probably a connection attempt from an unexpected client
// log that to warn the administrator.
- logger.debug(INFO_SSL_SERVER_CON_ATTEMPT_ERROR, socket.getRemoteSocketAddress().toString(),
+ logger.debug(INFO_SSL_SERVER_CON_ATTEMPT_ERROR, socket.getRemoteSocketAddress(),
socket.getLocalSocketAddress().toString(),
e.getLocalizedMessage());
return null;
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 45b969a..53279df 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
@@ -806,13 +806,13 @@
{
if (logger.isTraceEnabled())
logger.traceException(e);
- logger.error(ERR_COULD_NOT_CLOSE_THE_SOCKET.get(e.toString()));
+ logger.error(ERR_COULD_NOT_CLOSE_THE_SOCKET.get(e));
}
catch (InterruptedException e)
{
if (logger.isTraceEnabled())
logger.traceException(e);
- logger.error(ERR_COULD_NOT_STOP_LISTEN_THREAD.get(e.toString()));
+ logger.error(ERR_COULD_NOT_STOP_LISTEN_THREAD.get(e));
}
}
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 4427e6d..3b1e744 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
@@ -1234,7 +1234,7 @@
if (logger.isTraceEnabled())
{
- logger.trace(errorMessage.toString());
+ logger.trace(errorMessage);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
index 7a74900..30b4b02 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java
@@ -341,7 +341,7 @@
// Sanity check: is it a valid initial status?
if (!isValidInitialStatus(initStatus))
{
- logger.error(ERR_DS_INVALID_INIT_STATUS.get(initStatus.toString(),
+ logger.error(ERR_DS_INVALID_INIT_STATUS.get(initStatus,
getBaseDNString(), Integer.toString(getServerId())));
}
else
@@ -370,7 +370,7 @@
StatusMachineEvent event = StatusMachineEvent.statusToEvent(reqStatus);
if (event == StatusMachineEvent.INVALID_EVENT)
{
- logger.error(ERR_DS_INVALID_REQUESTED_STATUS.get(reqStatus.toString(),
+ logger.error(ERR_DS_INVALID_REQUESTED_STATUS.get(reqStatus,
getBaseDNString(), Integer.toString(getServerId())));
return;
}
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 08c67e7..f1d3515 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
@@ -196,7 +196,7 @@
LocalizableMessage message = WARN_CERTIFICATE_MATCH_PARSE_ERROR.get(ce.getMessage());
if (logger.isTraceEnabled())
{
- logger.trace(message.toString());
+ logger.trace(message);
}
// return the raw bytes as a fall back
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
index 3c5ec84..8d0e4c5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
@@ -563,7 +563,7 @@
false);
if (syntax == null)
{
- logger.error(ERR_ATTR_SYNTAX_MR_UNKNOWN_SYNTAX, valueStr, oidBuffer.toString());
+ logger.error(ERR_ATTR_SYNTAX_MR_UNKNOWN_SYNTAX, valueStr, oidBuffer);
syntax = DirectoryServer.getDefaultAttributeSyntax();
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
index 31bde9c..d43d61f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
@@ -224,7 +224,7 @@
if (! isValidSchemaElement(lowerValue, 0, lowerValue.length(),
invalidReason))
{
- logger.error(ERR_ATTR_SYNTAX_OID_INVALID_VALUE, lowerValue, invalidReason.toString());
+ logger.error(ERR_ATTR_SYNTAX_OID_INVALID_VALUE, lowerValue, invalidReason);
}
return ByteString.valueOf(lowerValue);
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
index 15d0165..6aa6d6e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
@@ -720,7 +720,7 @@
builder.append(" / ");
builder.append(backend.getBaseDNs()[i].toNormalizedString());
}
- logger.error(ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND, builder.toString(), ATTR_IMPORT_CLEAR_BACKEND);
+ logger.error(ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND, builder, ATTR_IMPORT_CLEAR_BACKEND);
return TaskState.STOPPED_BY_ERROR;
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java
index 5b83014..ecac625 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java
@@ -293,7 +293,7 @@
catch (ConfigException e)
{
logger.traceException(e);
- logger.error(ERR_RESTOREDB_NO_BACKENDS_FOR_DN, String.valueOf(backupDirectory), configEntryDN.toString());
+ logger.error(ERR_RESTOREDB_NO_BACKENDS_FOR_DN, String.valueOf(backupDirectory), configEntryDN);
return TaskState.STOPPED_BY_ERROR;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java b/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
index 2eeea03..c63576c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
@@ -973,7 +973,7 @@
StringBuilder unsupportedReason = new StringBuilder();
if (! b.supportsBackup(backupConfig, unsupportedReason))
{
- logger.error(ERR_BACKUPDB_CANNOT_BACKUP, b.getBackendID(), unsupportedReason.toString());
+ logger.error(ERR_BACKUPDB_CANNOT_BACKUP, b.getBackendID(), unsupportedReason);
errorsEncountered = true;
try
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java b/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
index e3a5c7a..345a571 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
@@ -626,7 +626,7 @@
if (backend == null)
{
- logger.error(ERR_RESTOREDB_NO_BACKENDS_FOR_DN, backupDirectory.getValue(), configEntryDN.toString());
+ logger.error(ERR_RESTOREDB_NO_BACKENDS_FOR_DN, backupDirectory.getValue(), configEntryDN);
return 1;
}
else if (! backend.supportsRestore())
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/FileManager.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/FileManager.java
index ef1a702..9f20051 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/FileManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/FileManager.java
@@ -186,8 +186,7 @@
}
else
{
- logger.debug(LocalizableMessage.raw(new StringBuilder("File '").append(file.toString())
- .append("' does not exist").toString()));
+ logger.debug(LocalizableMessage.raw("File '" + file + "' does not exist"));
}
}
@@ -370,9 +369,8 @@
{
if (insureParentsExist(destination))
{
- final LocalizableMessage message = LocalizableMessage.raw("Copying file '%s' to '%s'",
- objectFile.getAbsolutePath(), destination.getAbsolutePath());
- logger.debug(LocalizableMessage.raw(message.toString()));
+ logger.debug(LocalizableMessage.raw("Copying file '%s' to '%s'",
+ objectFile.getAbsolutePath(), destination.getAbsolutePath()));
FileInputStream fis = null;
FileOutputStream fos = null;
try
@@ -416,17 +414,15 @@
{
final LocalizableMessage errMsg = INFO_ERROR_COPYING_FILE.get(
objectFile.getAbsolutePath(), destination.getAbsolutePath());
- logger.error(LocalizableMessage.raw(errMsg.toString()));
+ logger.error(LocalizableMessage.raw(errMsg));
throw new IOException(errMsg.toString());
}
}
else
{
- final LocalizableMessage message = LocalizableMessage.raw(
+ logger.debug(LocalizableMessage.raw(
"Ignoring file '%s' since '%s' already exists",
- objectFile.getAbsolutePath(), destination.getAbsolutePath());
-
- logger.debug(LocalizableMessage.raw(message.toString()));
+ objectFile.getAbsolutePath(), destination.getAbsolutePath()));
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
index 340717c..d882a88 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
@@ -472,7 +472,7 @@
context.notify(INFO_UPGRADE_GENERAL_SEE_FOR_DETAILS.get(UpgradeUtils
.getInstallationPath()
+ File.separator + UpgradeLog.UPGRADELOGNAME), NOTICE_CALLBACK);
- logger.info(LocalizableMessage.raw(INFO_UPGRADE_PROCESS_END.get().toString()));
+ logger.info(INFO_UPGRADE_PROCESS_END);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
index 4ffd213..d46e958 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -137,7 +137,7 @@
public void perform(final UpgradeContext context) throws ClientException
{
final LocalizableMessage msg = INFO_UPGRADE_TASK_REPLACE_SCHEMA_FILE.get(fileName);
- logger.debug(LocalizableMessage.raw(msg.toString()));
+ logger.debug(msg);
final ProgressNotificationCallback pnc =
new ProgressNotificationCallback(0, msg, 0);
@@ -753,7 +753,7 @@
if (oldSnmpConfig.exists())
{
context.notifyProgress(pnc.setProgress(20));
- logger.debug(LocalizableMessage.raw(summary.toString()));
+ logger.debug(summary);
final File snmpConfig =
new File(UpgradeUtils.configSnmpSecurityDirectory,
@@ -863,7 +863,7 @@
}
if (ldif != null)
{
- logger.debug(LocalizableMessage.raw(Arrays.asList(ldif).toString()));
+ logger.debug(LocalizableMessage.raw(Arrays.toString(ldif)));
}
}
@@ -873,7 +873,7 @@
{
countErrors++;
context.notifyProgress(pnc.setProgress(-100));
- logger.error(LocalizableMessage.raw(message.toString()));
+ logger.error(message);
if (!context.isIgnoreErrorsMode())
{
throw new ClientException(EXIT_CODE_ERROR, message);
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 412d577..a59d778 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
@@ -332,7 +332,7 @@
toAttributesMap(operationalAttrBuilders);
Entry entry = new Entry(entryDN, objectClasses, userAttributes,
operationalAttributes);
- logger.trace(entry.toString());
+ logger.trace("readEntry1(), created entry: %s", entry);
try
{
@@ -528,7 +528,7 @@
toAttributesMap(operationalAttrBuilders);
Entry entry = new Entry(entryDN, objectClasses, userAttributes,
operationalAttributes);
- logger.trace(entry.toString());
+ logger.trace("readEntry2(), created entry: %s", entry);
try
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
index a1d4fb9..e143142 100644
--- a/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
+++ b/opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java
@@ -1147,8 +1147,7 @@
catch (Exception e)
{
logger.traceException(e);
-
- logger.error(cannotProcessAttributeMessage.get(v.getValue().toString(),
+ logger.error(cannotProcessAttributeMessage.get(v.getValue(),
String.valueOf(userEntry.getName())));
}
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
index 603f4af..61498ad 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
@@ -770,7 +770,7 @@
logger.trace(logMessages.get(0));
if (expectedMessage != null)
{
- logger.trace(expectedMessage.toString());
+ logger.trace(expectedMessage);
assertTrue(logMessages.get(0).indexOf(expectedMessage.toString()) > 0);
}
}
--
Gitblit v1.10.0