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/jeb/EntryContainer.java | 30 +++++++++---------------------
1 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
index a5f32ea..b0ad325 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -1647,8 +1647,7 @@
parentID = dn2id.get(txn, parentDN, LockMode.DEFAULT);
if (parentID == null)
{
- LocalizableMessage message = ERR_JEB_ADD_NO_SUCH_OBJECT.get(
- entry.getName().toString());
+ LocalizableMessage message = ERR_JEB_ADD_NO_SUCH_OBJECT.get(entry.getName());
DN matchedDN = getMatchedDN(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
message, matchedDN, null);
@@ -2367,10 +2366,8 @@
if (!currentDN.equals(entry.getName()) &&
dn2id.get(txn, entry.getName(), LockMode.DEFAULT) != null)
{
- LocalizableMessage message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(
- entry.getName().toString());
- throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
- message);
+ LocalizableMessage message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(entry.getName());
+ throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
}
EntryID oldApexID = dn2id.get(txn, currentDN, LockMode.DEFAULT);
@@ -2409,9 +2406,7 @@
EntryID newSuperiorID = dn2id.get(txn, newSuperiorDN, LockMode.DEFAULT);
if (newSuperiorID == null)
{
- LocalizableMessage msg =
- ERR_JEB_NEW_SUPERIOR_NO_SUCH_OBJECT.get(
- newSuperiorDN.toString());
+ LocalizableMessage msg = ERR_JEB_NEW_SUPERIOR_NO_SUCH_OBJECT.get(newSuperiorDN);
DN matchedDN = getMatchedDN(baseDN);
throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
msg, matchedDN, null);
@@ -2627,10 +2622,8 @@
{
if (!dn2id.insert(txn, newEntry.getName(), newID))
{
- LocalizableMessage message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(
- newEntry.getName().toString());
- throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
- message);
+ LocalizableMessage message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(newEntry.getName());
+ throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
}
id2entry.put(txn, newID, newEntry);
dn2uri.addEntry(txn, newEntry);
@@ -2769,10 +2762,8 @@
if (!pluginResult.continueProcessing())
{
- LocalizableMessage message = ERR_JEB_MODIFYDN_ABORTED_BY_SUBORDINATE_PLUGIN.get(
- oldDN.toString(), newDN.toString());
- throw new DirectoryException(
- DirectoryServer.getServerErrorResultCode(), message);
+ throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
+ ERR_JEB_MODIFYDN_ABORTED_BY_SUBORDINATE_PLUGIN.get(oldDN, newDN));
}
if (! modifications.isEmpty())
@@ -2782,10 +2773,7 @@
invalidReason))
{
LocalizableMessage message =
- ERR_JEB_MODIFYDN_ABORTED_BY_SUBORDINATE_SCHEMA_ERROR.get(
- oldDN.toString(),
- newDN.toString(),
- invalidReason.toString());
+ ERR_JEB_MODIFYDN_ABORTED_BY_SUBORDINATE_SCHEMA_ERROR.get(oldDN, newDN, invalidReason);
throw new DirectoryException(
DirectoryServer.getServerErrorResultCode(), message);
}
--
Gitblit v1.10.0