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/SchemaBackend.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
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 39b81c5..bb59752 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
@@ -4882,9 +4882,7 @@
public ConfigChangeResult applyConfigurationChange(
SchemaBackendCfg backendCfg)
{
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
- ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
+ final ConfigChangeResult ccr = new ConfigChangeResult();
// Check to see if we should apply a new set of base DNs.
@@ -4901,10 +4899,9 @@
{
logger.traceException(e);
-
- messages.add(ERR_SCHEMA_CANNOT_DETERMINE_BASE_DN.get(
+ ccr.addMessage(ERR_SCHEMA_CANNOT_DETERMINE_BASE_DN.get(
configEntryDN, getExceptionMessage(e)));
- resultCode = DirectoryServer.getServerErrorResultCode();
+ ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
newBaseDNs = null;
}
@@ -4946,13 +4943,13 @@
{
logger.traceException(e);
- messages.add(ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY.get(
+ ccr.addMessage(ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY.get(
configEntryDN, stackTraceToSingleLineString(e)));
- resultCode = DirectoryServer.getServerErrorResultCode();
+ ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
}
- if (resultCode == ResultCode.SUCCESS)
+ if (ccr.getResultCode() == ResultCode.SUCCESS)
{
// Get an array containing the new base DNs to use.
DN[] dnArray = new DN[newBaseDNs.size()];
@@ -4977,14 +4974,14 @@
try
{
DirectoryServer.deregisterBaseDN(dn);
- messages.add(INFO_SCHEMA_DEREGISTERED_BASE_DN.get(dn));
+ ccr.addMessage(INFO_SCHEMA_DEREGISTERED_BASE_DN.get(dn));
}
catch (Exception e)
{
logger.traceException(e);
- messages.add(ERR_SCHEMA_CANNOT_DEREGISTER_BASE_DN.get(dn, getExceptionMessage(e)));
- resultCode = DirectoryServer.getServerErrorResultCode();
+ ccr.addMessage(ERR_SCHEMA_CANNOT_DEREGISTER_BASE_DN.get(dn, getExceptionMessage(e)));
+ ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
}
}
@@ -4994,14 +4991,14 @@
try
{
DirectoryServer.registerBaseDN(dn, this, true);
- messages.add(INFO_SCHEMA_REGISTERED_BASE_DN.get(dn));
+ ccr.addMessage(INFO_SCHEMA_REGISTERED_BASE_DN.get(dn));
}
catch (Exception e)
{
logger.traceException(e);
- messages.add(ERR_SCHEMA_CANNOT_REGISTER_BASE_DN.get(dn, getExceptionMessage(e)));
- resultCode = DirectoryServer.getServerErrorResultCode();
+ ccr.addMessage(ERR_SCHEMA_CANNOT_REGISTER_BASE_DN.get(dn, getExceptionMessage(e)));
+ ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
}
}
@@ -5011,12 +5008,12 @@
userDefinedAttributes = newUserAttrs;
LocalizableMessage message = INFO_SCHEMA_USING_NEW_USER_ATTRS.get();
- messages.add(message);
+ ccr.addMessage(message);
}
currentConfig = backendCfg;
- return new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ return ccr;
}
--
Gitblit v1.10.0