From 8b3cd28204e15e0a98ce038b355f100cd7c44e3c Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <capponi.nicolas@gmail.com>
Date: Thu, 28 Jan 2016 08:28:20 +0000
Subject: [PATCH] OPENDJ-1632 (PR-201) Migrate AttributeType in one shot
---
opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java
index c231f7d..6fc97fb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.tasks;
@@ -36,6 +36,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
+import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.admin.std.server.SynchronizationProviderCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.SynchronizationProvider;
@@ -149,7 +150,7 @@
{
try
{
- SchemaConfigManager.loadSchemaFile(getServerContext(), schema, schemaFile);
+ SchemaConfigManager.loadSchemaFile(schema, schemaFile);
}
catch (ConfigException | InitializationException e)
{
@@ -184,8 +185,7 @@
{
try
{
- List<Modification> modList =
- SchemaConfigManager.loadSchemaFile(getServerContext(), schema, schemaFile);
+ List<Modification> modList = SchemaConfigManager.loadSchemaFile(schema, schemaFile);
for (Modification m : modList)
{
Attribute a = m.getAttribute();
--
Gitblit v1.10.0