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/TextAccessLogPublisher.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
index b999389..a33bca3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -26,31 +26,30 @@
*/
package org.opends.server.loggers;
+import static org.opends.messages.ConfigMessages.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.FileBasedAccessLogPublisherCfgDefn.*;
+import org.opends.server.admin.std.meta.FileBasedAccessLogPublisherCfgDefn.LogFormat;
import org.opends.server.admin.std.server.FileBasedAccessLogPublisherCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ExtendedOperationHandler;
-import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ResultCode;
-import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.util.TimeThread;
-import static org.opends.messages.ConfigMessages.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
* This class provides the implementation of the access logger used by the
* directory server.
@@ -111,10 +110,7 @@
public ConfigChangeResult applyConfigurationChange(
final FileBasedAccessLogPublisherCfg config)
{
- // Default result code.
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
- final List<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
+ final ConfigChangeResult ccr = new ConfigChangeResult();
final File logFile = getFileForPath(config.getLogFile());
final FileNamingPolicy fnPolicy = new TimeStampNaming(logFile);
@@ -203,7 +199,7 @@
if ((cfg.isAsynchronous() && config.isAsynchronous())
&& (cfg.getQueueSize() != config.getQueueSize()))
{
- adminActionRequired = true;
+ ccr.setAdminActionRequired(true);
}
if (!config.getLogRecordTimeFormat().equals(timeStampFormat))
@@ -219,12 +215,12 @@
}
catch (final 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