From 97050c54efee9d0cc89afb5fb61b9a1c67f73f6a Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 16 Nov 2016 19:28:22 +0000
Subject: [PATCH] OPENDJ-3460 Improve management of subordinate backend and naming contexts

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
index 40e767a..1538833 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
@@ -43,7 +43,6 @@
 
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.forgerock.opendj.config.Configuration;
 import org.forgerock.opendj.config.server.ConfigException;
 import org.forgerock.opendj.ldap.AttributeDescription;
 import org.forgerock.opendj.ldap.ByteString;
@@ -56,6 +55,7 @@
 import org.forgerock.opendj.ldap.schema.AttributeType;
 import org.forgerock.opendj.ldap.schema.CoreSchema;
 import org.forgerock.opendj.ldap.schema.ObjectClass;
+import org.forgerock.opendj.server.config.server.LocalBackendCfg;
 import org.opends.server.api.LocalBackend;
 import org.opends.server.controls.EntryChangelogNotificationControl;
 import org.opends.server.controls.ExternalChangelogRequestControl;
@@ -160,7 +160,7 @@
  *
  * @see ReplicationServer
  */
-public class ChangelogBackend extends LocalBackend<Configuration>
+public class ChangelogBackend extends LocalBackend<LocalBackendCfg>
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
@@ -242,11 +242,11 @@
   public static ChangelogBackend getInstance()
   {
     return (ChangelogBackend) DirectoryServer.getInstance().getServerContext().getBackendConfigManager()
-        .getLocalBackend(CHANGELOG_BASE_DN);
+        .findLocalBackendForEntry(CHANGELOG_BASE_DN);
   }
 
   @Override
-  public void configureBackend(final Configuration config, ServerContext serverContext) throws ConfigException
+  public void configureBackend(final LocalBackendCfg config, ServerContext serverContext) throws ConfigException
   {
     throw new UnsupportedOperationException("The changelog backend is not configurable");
   }

--
Gitblit v1.10.0