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/RootContainer.java | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 deletions(-)
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 d0d567d..3f90df2 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
@@ -287,9 +287,8 @@
// another to be opened.
if (ec1 != null)
{
- LocalizableMessage m = ERR_JEB_ENTRY_CONTAINER_ALREADY_REGISTERED.get(
- ec1.getDatabasePrefix(), baseDN.toString());
- throw new InitializationException(m);
+ throw new InitializationException(ERR_JEB_ENTRY_CONTAINER_ALREADY_REGISTERED.get(
+ ec1.getDatabasePrefix(), baseDN));
}
this.entryContainers.put(baseDN, entryContainer);
@@ -744,7 +743,6 @@
@Override
public ConfigChangeResult applyConfigurationChange(LocalDBBackendCfg cfg)
{
- ConfigChangeResult ccr;
boolean adminActionRequired = false;
ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
@@ -834,25 +832,21 @@
{
if(!backendDirectory.mkdirs())
{
- messages.add(ERR_JEB_CREATE_FAIL.get(
- backendDirectory.getPath()));
- ccr = new ConfigChangeResult(
+ messages.add(ERR_JEB_CREATE_FAIL.get(backendDirectory.getPath()));
+ return new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(),
adminActionRequired,
messages);
- return ccr;
}
}
//Make sure the directory is valid.
else if (!backendDirectory.isDirectory())
{
- messages.add(ERR_JEB_DIRECTORY_INVALID.get(
- backendDirectory.getPath()));
- ccr = new ConfigChangeResult(
+ messages.add(ERR_JEB_DIRECTORY_INVALID.get(backendDirectory.getPath()));
+ return new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(),
adminActionRequired,
messages);
- return ccr;
}
adminActionRequired = true;
@@ -872,13 +866,11 @@
}
catch(Exception e)
{
- messages.add(ERR_CONFIG_BACKEND_MODE_INVALID.get(
- config.dn().toString()));
- ccr = new ConfigChangeResult(
+ messages.add(ERR_CONFIG_BACKEND_MODE_INVALID.get(config.dn()));
+ return new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(),
adminActionRequired,
messages);
- return ccr;
}
//Make sure the mode will allow the server itself access to
@@ -889,11 +881,10 @@
{
messages.add(ERR_CONFIG_BACKEND_INSANE_MODE.get(
cfg.getDBDirectoryPermissions()));
- ccr = new ConfigChangeResult(
+ return new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(),
adminActionRequired,
messages);
- return ccr;
}
// Get the backend database backendDirectory permissions and apply
@@ -928,16 +919,12 @@
catch (Exception e)
{
messages.add(LocalizableMessage.raw(stackTraceToSingleLineString(e)));
- ccr = new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
+ return new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
adminActionRequired,
messages);
- return ccr;
}
-
- ccr = new ConfigChangeResult(ResultCode.SUCCESS, adminActionRequired,
- messages);
- return ccr;
+ return new ConfigChangeResult(ResultCode.SUCCESS, adminActionRequired, messages);
}
/**
--
Gitblit v1.10.0