From 2721ee7ac9cf93655cd8945befdaa1ee75dacfdf Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 25 Nov 2016 14:50:11 +0000
Subject: [PATCH] Manual fixes/changes post inlining DirectoryServer.getConfigurationHandler()
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 8ae8f91..13c265a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -3876,9 +3876,9 @@
try
{
DN eclConfigEntryDN = DN.valueOf("cn=external changeLog," + config.dn());
- if (DirectoryServer.getInstance().getServerContext().getConfigurationHandler().hasEntry(eclConfigEntryDN))
+ if (getServerContext().getConfigurationHandler().hasEntry(eclConfigEntryDN))
{
- DirectoryServer.getInstance().getServerContext().getConfigurationHandler().deleteEntry(eclConfigEntryDN);
+ getServerContext().getConfigurationHandler().deleteEntry(eclConfigEntryDN);
}
}
catch(Exception e)
@@ -3903,7 +3903,7 @@
try
{
DN configDn = config.dn();
- ConfigurationHandler configHandler = DirectoryServer.getInstance().getServerContext().getConfigurationHandler();
+ ConfigurationHandler configHandler = getServerContext().getConfigurationHandler();
if (configHandler.hasEntry(config.dn()))
{
try
@@ -4834,7 +4834,7 @@
* For each class in specificClassesAttributes1, check that the attribute
* list is equivalent to specificClassesAttributes2 attribute list
*/
- Schema schema = DirectoryServer.getInstance().getServerContext().getSchema();
+ Schema schema = getServerContext().getSchema();
for (Map.Entry<String, Set<String>> entry : specificClassesAttrs1.entrySet())
{
String className1 = entry.getKey();
--
Gitblit v1.10.0