From bb6bb0b50b588cd9c256f20d13413e8158a87999 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 Nov 2015 11:09:22 +0000
Subject: [PATCH] OPENDJ-2478 dsconfig fails with "Undefined" error message while deleting a log publisher
---
opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java
index d00339f..4ab8fb4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java
@@ -229,7 +229,7 @@
if (config.isEnabled())
{
- final P logPublisher = isCommonAuditConfig(config) ?
+ final P logPublisher = serverContext.getCommonAudit().isCommonAuditConfig(config) ?
getLogPublisherForCommonAudit(config) : getLogPublisher(config);
addLogPublisher(logPublisher);
}
@@ -271,7 +271,7 @@
{
try
{
- final P logPublisher = isCommonAuditConfig(config) ?
+ final P logPublisher = serverContext.getCommonAudit().isCommonAuditConfig(config) ?
getLogPublisherForCommonAudit(config) : getLogPublisher(config);
addLogPublisher(logPublisher);
}
@@ -333,9 +333,10 @@
}
try
{
- if (isCommonAuditConfig(config))
+ CommonAudit commonAudit = serverContext.getCommonAudit();
+ if (commonAudit.isCommonAuditConfig(config))
{
- serverContext.getCommonAudit().addOrUpdatePublisher(config);
+ commonAudit.addOrUpdatePublisher(config);
} // else the publisher is currently active, so we don't need to do
// anything.
}
@@ -374,9 +375,10 @@
removeLogPublisher(logPublisher);
try
{
- if (isCommonAuditConfig(config))
+ CommonAudit commonAudit = serverContext.getCommonAudit();
+ if (commonAudit.isExistingCommonAuditConfig(config))
{
- serverContext.getCommonAudit().removePublisher(config);
+ commonAudit.removePublisher(config);
}
}
catch (ConfigException e)
--
Gitblit v1.10.0