From c3ddd7489abd06155b872cc23cef3575e2ee1b9a Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 08 Jan 2014 09:55:13 +0000
Subject: [PATCH] Align server types API with SDK types API
---
opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java b/opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java
index 7bee472..53cc7bb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.backends.task;
@@ -179,7 +180,7 @@
{
this.taskScheduler = taskScheduler;
this.taskEntry = taskEntry;
- this.taskEntryDN = taskEntry.getDN();
+ this.taskEntryDN = taskEntry.getName();
String taskDN = taskEntryDN.toString();
@@ -196,7 +197,7 @@
if (recurringTaskID == null)
{
Message message = ERR_TASK_MISSING_ATTR.get(
- String.valueOf(taskEntry.getDN()), ATTR_TASK_ID);
+ String.valueOf(taskEntry.getName()), ATTR_TASK_ID);
throw new InitializationException(message);
}
else
@@ -388,7 +389,7 @@
if (isRequired)
{
Message message = ERR_TASK_MISSING_ATTR.get(
- String.valueOf(taskEntry.getDN()), attributeName);
+ String.valueOf(taskEntry.getName()), attributeName);
throw new InitializationException(message);
}
else
@@ -400,7 +401,7 @@
if (attrList.size() > 1)
{
Message message = ERR_TASK_MULTIPLE_ATTRS_FOR_TYPE.get(
- attributeName, String.valueOf(taskEntry.getDN()));
+ attributeName, String.valueOf(taskEntry.getName()));
throw new InitializationException(message);
}
@@ -410,7 +411,7 @@
if (isRequired)
{
Message message = ERR_TASK_NO_VALUES_FOR_ATTR.get(
- attributeName, String.valueOf(taskEntry.getDN()));
+ attributeName, String.valueOf(taskEntry.getName()));
throw new InitializationException(message);
}
else
@@ -423,7 +424,7 @@
if (iterator.hasNext())
{
Message message = ERR_TASK_MULTIPLE_VALUES_FOR_ATTR.get(
- attributeName, String.valueOf(taskEntry.getDN()));
+ attributeName, String.valueOf(taskEntry.getName()));
throw new InitializationException(message);
}
@@ -460,7 +461,7 @@
if (attrList.size() > 1)
{
Message message = ERR_TASK_MULTIPLE_ATTRS_FOR_TYPE.get(
- attributeName, String.valueOf(taskEntry.getDN()));
+ attributeName, String.valueOf(taskEntry.getName()));
throw new InitializationException(message);
}
@@ -1160,7 +1161,7 @@
taskState = TaskState.STOPPED_BY_ERROR;
Message message = ERR_TASK_EXECUTE_FAILED.get(
- String.valueOf(taskEntry.getDN()), stackTraceToSingleLineString(e));
+ String.valueOf(taskEntry.getName()), stackTraceToSingleLineString(e));
logError(message);
}
--
Gitblit v1.10.0