From f2081ed7fa0035da4567342a9510fb0112c02ccf Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 09 Sep 2016 09:45:23 +0000
Subject: [PATCH] OPENDJ-3089 Remove simple references to SchemaConfigManager

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index 0d541bd..a0ae904 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -77,7 +77,6 @@
 import org.opends.server.core.DirectoryServer;
 import org.opends.server.core.ModifyDNOperation;
 import org.opends.server.core.ModifyOperation;
-import org.opends.server.core.SchemaConfigManager;
 import org.opends.server.core.SchemaHandler;
 import org.opends.server.core.SearchOperation;
 import org.opends.server.core.ServerContext;
@@ -1872,7 +1871,15 @@
   @Override
   public File getDirectory()
   {
-    return new File(SchemaConfigManager.getSchemaDirectoryPath());
+    try
+    {
+      return schemaHandler.getSchemaDirectoryPath();
+    }
+    catch (InitializationException e)
+    {
+      logger.traceException(e);
+      return null;
+    }
   }
 
   private static final FileFilter BACKUP_FILES_FILTER = new FileFilter()

--
Gitblit v1.10.0