From a1f030edc5d19b575470f0d79033d9f7471ab172 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 31 Jan 2014 14:49:58 +0000
Subject: [PATCH] Removed now useless calls to .toString() on arguments of ArgN.get(...).
---
opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java | 39 ++++++++++++++++-----------------------
1 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
index 443c74a..50b2753 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
@@ -122,9 +122,7 @@
// map.
if (baseDNs == null || baseDNs.length != 1)
{
- LocalizableMessage message = ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(
- currentConfig.dn().toString());
- throw new ConfigException(message);
+ throw new ConfigException(ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(currentConfig.dn()));
}
for (DN dn : baseDNs)
@@ -139,7 +137,7 @@
logger.traceException(e);
LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
- dn.toString(), getExceptionMessage(e));
+ dn, getExceptionMessage(e));
throw new InitializationException(message, e);
}
}
@@ -220,7 +218,7 @@
LocalizableMessage m = ERR_LDIF_BACKEND_ERROR_CREATING_FILE.get(
tempFile.getAbsolutePath(),
- currentConfig.dn().toString(),
+ currentConfig.dn(),
stackTraceToSingleLineString(e));
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
@@ -243,7 +241,7 @@
LocalizableMessage m = ERR_LDIF_BACKEND_ERROR_WRITING_FILE.get(
tempFile.getAbsolutePath(),
- currentConfig.dn().toString(),
+ currentConfig.dn(),
stackTraceToSingleLineString(e));
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
@@ -292,7 +290,7 @@
LocalizableMessage m = ERR_LDIF_BACKEND_ERROR_RENAMING_FILE.get(
tempFile.getAbsolutePath(),
ldifFile.getAbsolutePath(),
- currentConfig.dn().toString(),
+ currentConfig.dn(),
stackTraceToSingleLineString(e));
DirectoryServer.sendAlertNotification(this,
ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
@@ -783,16 +781,13 @@
parentDN = parentDN.getParentDNInSuffix();
}
- LocalizableMessage m = ERR_LDIF_BACKEND_MODDN_NO_SUCH_SOURCE_ENTRY.get(
- currentDN.toString());
- throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, m, matchedDN,
- null);
+ LocalizableMessage m = ERR_LDIF_BACKEND_MODDN_NO_SUCH_SOURCE_ENTRY.get(currentDN);
+ throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, m, matchedDN, null);
}
if (entryMap.containsKey(newDN))
{
- LocalizableMessage m = ERR_LDIF_BACKEND_MODDN_TARGET_ENTRY_ALREADY_EXISTS.get(
- newDN.toString());
+ LocalizableMessage m = ERR_LDIF_BACKEND_MODDN_TARGET_ENTRY_ALREADY_EXISTS.get(newDN);
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, m);
}
@@ -1140,8 +1135,8 @@
DN entryDN = e.getName();
if (entryMap.containsKey(entryDN))
{
- LocalizableMessage m = ERR_LDIF_BACKEND_DUPLICATE_ENTRY.get(ldifFilePath,
- currentConfig.dn().toString(), entryDN.toString());
+ LocalizableMessage m =
+ ERR_LDIF_BACKEND_DUPLICATE_ENTRY.get(ldifFilePath, currentConfig.dn(), entryDN);
logger.error(m);
reader.rejectLastEntry(m);
continue;
@@ -1169,8 +1164,8 @@
if (! isBelowBaseDN)
{
- LocalizableMessage m = ERR_LDIF_BACKEND_ENTRY_OUT_OF_SCOPE.get(ldifFilePath,
- currentConfig.dn().toString(), entryDN.toString());
+ LocalizableMessage m = ERR_LDIF_BACKEND_ENTRY_OUT_OF_SCOPE.get(
+ ldifFilePath, currentConfig.dn(), entryDN);
logger.error(m);
reader.rejectLastEntry(m);
continue;
@@ -1179,8 +1174,8 @@
DN parentDN = entryDN.getParentDNInSuffix();
if (parentDN == null || !entryMap.containsKey(parentDN))
{
- LocalizableMessage m = ERR_LDIF_BACKEND_MISSING_PARENT.get(ldifFilePath,
- currentConfig.dn().toString(), entryDN.toString());
+ LocalizableMessage m = ERR_LDIF_BACKEND_MISSING_PARENT.get(
+ ldifFilePath, currentConfig.dn(), entryDN);
logger.error(m);
reader.rejectLastEntry(m);
continue;
@@ -1314,8 +1309,7 @@
currentConfig.getBaseDN().toArray(baseDNs);
if (baseDNs.length != 1)
{
- throw new ConfigException(ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(
- currentConfig.dn().toString()));
+ throw new ConfigException(ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(currentConfig.dn()));
}
baseDNSet = new HashSet<DN>();
@@ -1342,8 +1336,7 @@
// Make sure that there is only a single base DN.
if (configuration.getBaseDN().size() != 1)
{
- unacceptableReasons.add(ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(
- configuration.dn().toString()));
+ unacceptableReasons.add(ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(configuration.dn()));
configAcceptable = false;
}
--
Gitblit v1.10.0