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/loggers/TextErrorLogPublisher.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
index bb19653..4f1ece1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
@@ -33,7 +33,6 @@
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
@@ -42,7 +41,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
-import org.forgerock.opendj.ldap.ResultCode;
import org.opends.messages.Severity;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.ErrorLogPublisherCfgDefn;
@@ -296,9 +294,7 @@
@Override
public ConfigChangeResult applyConfigurationChange(FileBasedErrorLogPublisherCfg config)
{
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
- List<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
+ final ConfigChangeResult ccr = new ConfigChangeResult();
setDefaultSeverities(config.getDefaultSeverity());
@@ -310,8 +306,8 @@
int equalPos = overrideSeverity.indexOf('=');
if (equalPos < 0)
{
- resultCode = DirectoryServer.getServerErrorResultCode();
- messages.add(WARN_ERROR_LOGGER_INVALID_OVERRIDE_SEVERITY.get(overrideSeverity));
+ ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
+ ccr.addMessage(WARN_ERROR_LOGGER_INVALID_OVERRIDE_SEVERITY.get(overrideSeverity));
} else
{
String category = overrideSeverity.substring(0, equalPos);
@@ -348,8 +344,8 @@
}
catch(Exception e)
{
- resultCode = DirectoryServer.getServerErrorResultCode();
- messages.add(WARN_ERROR_LOGGER_INVALID_CATEGORY.get(category));
+ ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
+ ccr.addMessage(WARN_ERROR_LOGGER_INVALID_CATEGORY.get(category));
}
}
}
@@ -419,7 +415,7 @@
&& config.isAsynchronous()
&& currentConfig.getQueueSize() != config.getQueueSize())
{
- adminActionRequired = true;
+ ccr.setAdminActionRequired(true);
}
currentConfig = config;
@@ -427,12 +423,12 @@
}
catch(Exception e)
{
- resultCode = DirectoryServer.getServerErrorResultCode();
- messages.add(ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
+ ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
+ ccr.addMessage(ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
config.dn(), stackTraceToSingleLineString(e)));
}
- return new ConfigChangeResult(resultCode, adminActionRequired, messages);
+ return ccr;
}
private void setDefaultSeverities(Set<ErrorLogPublisherCfgDefn.DefaultSeverity> defSevs)
--
Gitblit v1.10.0