From ba663b53d933130d2b6a68c1644e5744428dd1d6 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 25 Nov 2016 11:41:50 +0000
Subject: [PATCH] Manual fixes/changes post inlining DirectoryServer.getSchema()
---
opendj-server-legacy/src/main/java/org/opends/server/tasks/InitializeTargetTask.java | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/InitializeTargetTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/InitializeTargetTask.java
index 8f9a774..c493f74 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/InitializeTargetTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/InitializeTargetTask.java
@@ -18,22 +18,17 @@
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.core.DirectoryServer.*;
import static org.opends.server.util.StaticUtils.*;
-import java.util.List;
-
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.messages.TaskMessages;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
import org.opends.server.replication.plugin.LDAPReplicationDomain;
-import org.opends.server.types.Attribute;
-import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
@@ -51,7 +46,6 @@
private int target;
private long total;
- /** {@inheritDoc} */
@Override
public LocalizableMessage getDisplayName() {
return TaskMessages.INFO_TASK_INITIALIZE_TARGET_NAME.get();
@@ -69,11 +63,7 @@
// FIXME -- Do we need any special authorization here?
Entry taskEntry = getTaskEntry();
- AttributeType typeDomainBase = getInstance().getServerContext().getSchema().getAttributeType(ATTR_TASK_INITIALIZE_TARGET_DOMAIN_DN);
- AttributeType typeScope = getInstance().getServerContext().getSchema().getAttributeType(ATTR_TASK_INITIALIZE_TARGET_SCOPE);
-
- List<Attribute> attrList = taskEntry.getAllAttributes(typeDomainBase);
- domainString = TaskUtils.getSingleValueString(attrList);
+ domainString = TaskUtils.getSingleValueString(taskEntry.getAllAttributes(ATTR_TASK_INITIALIZE_TARGET_DOMAIN_DN));
try
{
@@ -90,14 +80,12 @@
throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, e);
}
- attrList = taskEntry.getAllAttributes(typeScope);
- String targetString = TaskUtils.getSingleValueString(attrList);
- target = domain.decodeTarget(targetString);
+ target = domain.decodeTarget(TaskUtils.getSingleValueString(
+ taskEntry.getAllAttributes(ATTR_TASK_INITIALIZE_TARGET_SCOPE)));
setTotal(0);
}
- /** {@inheritDoc} */
@Override
protected TaskState runTask()
{
--
Gitblit v1.10.0