From 4f6891a8bd4d017a41b5f75748398ff59787501c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 15 Oct 2015 19:38:35 +0000
Subject: [PATCH] Renamed DirectoryServer.getAttributeType() to DirectoryServer.getAttributeTypeOrNull().
---
opendj-server-legacy/src/main/java/org/opends/server/backends/task/RecurringTask.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/RecurringTask.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/RecurringTask.java
index 9a87554..6be86a0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/RecurringTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/RecurringTask.java
@@ -188,7 +188,7 @@
// Get the schedule for this task.
- attrType = DirectoryServer.getAttributeType(ATTR_RECURRING_TASK_SCHEDULE.toLowerCase());
+ attrType = DirectoryServer.getAttributeTypeOrNull(ATTR_RECURRING_TASK_SCHEDULE.toLowerCase());
if (attrType == null)
{
attrType = DirectoryServer.getDefaultAttributeType(ATTR_RECURRING_TASK_SCHEDULE);
@@ -238,7 +238,7 @@
weekdayArray = taskArrays[WEEKDAY_INDEX];
// Get the class name from the entry. If there isn't one, then fail.
- attrType = DirectoryServer.getAttributeType(ATTR_TASK_CLASS.toLowerCase());
+ attrType = DirectoryServer.getAttributeTypeOrNull(ATTR_TASK_CLASS.toLowerCase());
if (attrType == null)
{
attrType = DirectoryServer.getDefaultAttributeType(ATTR_TASK_CLASS);
@@ -408,7 +408,7 @@
SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String nextTaskID = task.getTaskID() + "-" + df.format(nextTaskDate);
String nextTaskIDName = NAME_PREFIX_TASK + "id";
- AttributeType taskIDAttrType = DirectoryServer.getAttributeType(nextTaskIDName);
+ AttributeType taskIDAttrType = DirectoryServer.getAttributeTypeOrNull(nextTaskIDName);
Attribute nextTaskIDAttr = Attributes.create(taskIDAttrType, nextTaskID);
nextTaskEntry.replaceAttribute(nextTaskIDAttr);
RDN nextTaskRDN = RDN.decode(nextTaskIDName + "=" + nextTaskID);
@@ -416,12 +416,9 @@
taskScheduler.getTaskBackend().getScheduledTasksParentDN());
nextTaskEntry.setDN(nextTaskDN);
- String nextTaskStartTimeName = NAME_PREFIX_TASK +
- "scheduled-start-time";
- AttributeType taskStartTimeAttrType =
- DirectoryServer.getAttributeType(nextTaskStartTimeName);
- Attribute nextTaskStartTimeAttr = Attributes.create(
- taskStartTimeAttrType, nextTaskStartTime);
+ String nextTaskStartTimeName = NAME_PREFIX_TASK + "scheduled-start-time";
+ AttributeType taskStartTimeAttrType = DirectoryServer.getAttributeTypeOrNull(nextTaskStartTimeName);
+ Attribute nextTaskStartTimeAttr = Attributes.create(taskStartTimeAttrType, nextTaskStartTime);
nextTaskEntry.replaceAttribute(nextTaskStartTimeAttr);
nextTask.initializeTaskInternal(serverContext, taskScheduler, nextTaskEntry);
--
Gitblit v1.10.0