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/TextAuditLogPublisher.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
index 5f34b7e..fa2fe89 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
@@ -33,7 +33,6 @@
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
@@ -44,7 +43,6 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
-import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.Base64;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
@@ -59,11 +57,8 @@
{
private TextWriter writer;
-
private FileBasedAuditLogPublisherCfg cfg;
-
-
/**
* {@inheritDoc}
*/
@@ -71,10 +66,7 @@
public ConfigChangeResult applyConfigurationChange(
FileBasedAuditLogPublisherCfg config)
{
- // Default result code.
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
- ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
+ final ConfigChangeResult ccr = new ConfigChangeResult();
File logFile = getFileForPath(config.getLogFile());
FileNamingPolicy fnPolicy = new TimeStampNaming(logFile);
@@ -145,7 +137,7 @@
if ((cfg.isAsynchronous() && config.isAsynchronous())
&& (cfg.getQueueSize() != config.getQueueSize()))
{
- adminActionRequired = true;
+ ccr.setAdminActionRequired(true);
}
cfg = config;
@@ -153,12 +145,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;
}
--
Gitblit v1.10.0