From 33047cc2802d7174ad06bc62e972bc9a876abe99 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 25 Nov 2016 09:17:03 +0000
Subject: [PATCH] Inlined DirectoryServer.getSchema()

---
 opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java
index 5f48989..6d31e1d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java
@@ -98,8 +98,8 @@
       return;
     }
 
-    AttributeType attrType1 = DirectoryServer.getSchema().getAttributeType("adminport");
-    AttributeType attrType2 = DirectoryServer.getSchema().getAttributeType("adminEnabled");
+    AttributeType attrType1 = DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType("adminport");
+    AttributeType attrType2 = DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType("adminEnabled");
 
     LinkedList<Modification> mods = new LinkedList<>();
     mods.add(new Modification(ModificationType.REPLACE, Attributes.create(attrType1, adminPort)));
@@ -222,7 +222,7 @@
     if (!result.isEmpty())
     {
       SearchResultEntry adminConnectorEntry = result.getFirst();
-      AttributeType attrType = DirectoryServer.getSchema().getAttributeType(attrName);
+      AttributeType attrType = DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType(attrName);
       List<Attribute> attrs = adminConnectorEntry.getAllAttributes(attrType);
       if (!attrs.isEmpty())
       {

--
Gitblit v1.10.0