From a970806a80761212893d746ede29a107d101b192 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Mon, 20 Jul 2015 09:16:19 +0000
Subject: [PATCH] OPENDJ-2212: Administrator Connector configuration is not applied.
---
opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java
index 8d2b35f..813809b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java
@@ -138,15 +138,10 @@
{
this.config = configuration;
- // Create a fake LDAP connection handler configuration
- LDAPConnectionHandlerCfg ldapConnectionHandlerCfg =
- new FakeLDAPConnectionHandlerCfg(config);
-
// Administration Connector uses the LDAP connection handler implementation
adminConnectionHandler = new LDAPConnectionHandler(
new SynchronousStrategy(), FRIENDLY_NAME);
- adminConnectionHandler
- .initializeConnectionHandler(ldapConnectionHandlerCfg);
+ adminConnectionHandler.initializeConnectionHandler(new LDAPConnectionCfgAdapter(config));
adminConnectionHandler.setAdminConnectionHandler();
// Register this as a change listener.
@@ -176,9 +171,7 @@
AdministrationConnectorCfg configuration,
List<LocalizableMessage> unacceptableReasons)
{
- LDAPConnectionHandlerCfg cfg = new FakeLDAPConnectionHandlerCfg(
- configuration);
- return adminConnectionHandler.isConfigurationAcceptable(cfg,
+ return adminConnectionHandler.isConfigurationAcceptable(new LDAPConnectionCfgAdapter(configuration),
unacceptableReasons);
}
@@ -187,7 +180,7 @@
public ConfigChangeResult applyConfigurationChange(
AdministrationConnectorCfg configuration)
{
- return new ConfigChangeResult();
+ return adminConnectionHandler.applyConfigurationChange(new LDAPConnectionCfgAdapter(configuration));
}
@@ -196,12 +189,12 @@
* This private class implements a fake LDAP connection Handler configuration.
* This allows to re-use the LDAPConnectionHandler as it is.
*/
- private static class FakeLDAPConnectionHandlerCfg implements
+ private static class LDAPConnectionCfgAdapter implements
LDAPConnectionHandlerCfg
{
private final AdministrationConnectorCfg config;
- public FakeLDAPConnectionHandlerCfg(AdministrationConnectorCfg config)
+ public LDAPConnectionCfgAdapter(AdministrationConnectorCfg config)
{
this.config = config;
}
--
Gitblit v1.10.0