From 6d1ebe16f8bfd23ef5de615dc7fab6468f7ef3f8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 24 Dec 2014 15:01:44 +0000
Subject: [PATCH] Code cleanup
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
index 544ae50..8e7be6b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -26,6 +26,14 @@
*/
package org.opends.server.backends.jeb;
+import static com.sleepycat.je.EnvironmentConfig.*;
+
+import static org.opends.messages.BackendMessages.*;
+import static org.opends.messages.JebMessages.*;
+import static org.opends.server.backends.jeb.ConfigurableEnvironment.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.io.File;
import java.io.IOException;
import java.util.*;
@@ -58,14 +66,6 @@
import com.sleepycat.je.EnvironmentConfig;
import com.sleepycat.je.EnvironmentFailureException;
-import static com.sleepycat.je.EnvironmentConfig.*;
-
-import static org.opends.messages.BackendMessages.*;
-import static org.opends.messages.JebMessages.*;
-import static org.opends.server.backends.jeb.ConfigurableEnvironment.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
* This is an implementation of a Directory Server Backend which stores entries
* locally in a Berkeley DB JE database.
@@ -1028,8 +1028,7 @@
@Override
public ConfigChangeResult applyConfigurationChange(LocalDBBackendCfg newCfg)
{
- ResultCode resultCode = ResultCode.SUCCESS;
- ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
+ final ConfigChangeResult ccr = new ConfigChangeResult();
try
{
@@ -1040,7 +1039,7 @@
// Check for changes to the base DNs.
removeDeletedBaseDNs(newBaseDNs);
- ConfigChangeResult failure = createNewBaseDNs(newBaseDNsArray, messages);
+ ConfigChangeResult failure = createNewBaseDNs(newBaseDNsArray, ccr);
if (failure != null)
{
return failure;
@@ -1061,12 +1060,11 @@
}
catch (Exception e)
{
- messages.add(LocalizableMessage.raw(stackTraceToSingleLineString(e)));
- return new ConfigChangeResult(
- DirectoryServer.getServerErrorResultCode(), false, messages);
+ ccr.addMessage(LocalizableMessage.raw(stackTraceToSingleLineString(e)));
+ ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
}
- return new ConfigChangeResult(resultCode, false, messages);
+ return ccr;
}
private void removeDeletedBaseDNs(SortedSet<DN> newBaseDNs) throws DirectoryException
@@ -1084,7 +1082,7 @@
}
}
- private ConfigChangeResult createNewBaseDNs(DN[] newBaseDNsArray, ArrayList<LocalizableMessage> messages)
+ private ConfigChangeResult createNewBaseDNs(DN[] newBaseDNsArray, final ConfigChangeResult ccr)
{
for (DN baseDN : newBaseDNsArray)
{
@@ -1101,9 +1099,9 @@
{
logger.traceException(e);
- ResultCode resultCode = DirectoryServer.getServerErrorResultCode();
- messages.add(ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(baseDN, e));
- return new ConfigChangeResult(resultCode, false, messages);
+ ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
+ ccr.addMessage(ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(baseDN, e));
+ return ccr;
}
}
}
--
Gitblit v1.10.0