From 470936255a009dd659e3736df92ce1a6c2767362 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:35 +0000
Subject: [PATCH] Extracted method ServerContext.getRootConfig()
---
opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java
index f7fbd4f..017a018 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAudit.java
@@ -72,7 +72,6 @@
import org.forgerock.opendj.server.config.server.LogPublisherCfg;
import org.forgerock.opendj.server.config.server.LogRetentionPolicyCfg;
import org.forgerock.opendj.server.config.server.LogRotationPolicyCfg;
-import org.forgerock.opendj.server.config.server.RootCfg;
import org.forgerock.opendj.server.config.server.SizeLimitLogRetentionPolicyCfg;
import org.forgerock.opendj.server.config.server.SizeLimitLogRotationPolicyCfg;
import org.forgerock.opendj.server.config.server.TimeLimitLogRotationPolicyCfg;
@@ -511,7 +510,6 @@
private void addCsvHandlerRotationConfig(PublisherConfig publisher, CsvConfigData config,
CsvAuditEventHandlerConfiguration auditConfig) throws ConfigException
{
- RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
SortedSet<String> rotationPolicies = config.getRotationPolicies();
if (rotationPolicies.isEmpty())
{
@@ -522,7 +520,7 @@
fileRotation.setRotationEnabled(true);
for (final String policy : rotationPolicies)
{
- LogRotationPolicyCfg policyConfig = root.getLogRotationPolicy(policy);
+ LogRotationPolicyCfg policyConfig = serverContext.getRootConfig().getLogRotationPolicy(policy);
if (policyConfig instanceof FixedTimeLogRotationPolicyCfg)
{
List<String> times = convertTimesOfDay(publisher, (FixedTimeLogRotationPolicyCfg) policyConfig);
@@ -549,7 +547,6 @@
private void addCsvHandlerRetentionConfig(PublisherConfig publisher, CsvConfigData config,
CsvAuditEventHandlerConfiguration auditConfig) throws ConfigException
{
- RootCfg root = serverContext.getServerManagementContext().getRootConfiguration();
SortedSet<String> retentionPolicies = config.getRetentionPolicies();
if (retentionPolicies.isEmpty())
{
@@ -559,7 +556,7 @@
FileRetention fileRetention = new FileRetention();
for (final String policy : retentionPolicies)
{
- LogRetentionPolicyCfg policyConfig = root.getLogRetentionPolicy(policy);
+ LogRetentionPolicyCfg policyConfig = serverContext.getRootConfig().getLogRetentionPolicy(policy);
if (policyConfig instanceof FileCountLogRetentionPolicyCfg)
{
fileRetention.setMaxNumberOfHistoryFiles(((FileCountLogRetentionPolicyCfg) policyConfig).getNumberOfFiles());
--
Gitblit v1.10.0