From be7c9be12ddf4717855de61e89b0042fa886503b Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 09 Sep 2016 09:45:26 +0000
Subject: [PATCH] OPENDJ-3089 OPENDJ-1237 SchemaWriter provides list of offline schema modifications without static call to DirectoryServer
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java
index 4f6fba1..c632fb8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -51,6 +51,7 @@
import org.opends.server.api.RestoreTaskListener;
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.ServerContext;
import org.opends.server.replication.service.DSRSShutdownSync;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.Control;
@@ -250,7 +251,7 @@
}
@Override
- public void initializeSynchronizationProvider(
+ public void initializeSynchronizationProvider(ServerContext serverContext,
ReplicationSynchronizationProviderCfg cfg) throws ConfigException
{
domains.clear();
@@ -275,8 +276,7 @@
}
// If any schema changes were made with the server offline, then handle them now.
- List<Modification> offlineSchemaChanges =
- DirectoryServer.getOfflineSchemaChanges();
+ List<Modification> offlineSchemaChanges = serverContext.getSchemaHandler().getOfflineSchemaModifications();
if (offlineSchemaChanges != null && !offlineSchemaChanges.isEmpty())
{
processSchemaChange(offlineSchemaChanges);
--
Gitblit v1.10.0