From 33047cc2802d7174ad06bc62e972bc9a876abe99 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 25 Nov 2016 09:17:03 +0000
Subject: [PATCH] Inlined DirectoryServer.getSchema()
---
opendj-server-legacy/src/main/java/org/opends/server/tasks/ExportTask.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ExportTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ExportTask.java
index 3ef7735..9d592ae 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ExportTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ExportTask.java
@@ -123,7 +123,7 @@
}
Entry taskEntry = getTaskEntry();
- AttributeType typeWrapColumn = getSchema().getAttributeType(ATTR_TASK_EXPORT_WRAP_COLUMN);
+ AttributeType typeWrapColumn = getInstance().getServerContext().getSchema().getAttributeType(ATTR_TASK_EXPORT_WRAP_COLUMN);
ldifFile = toString(taskEntry, ATTR_TASK_EXPORT_LDIF_FILE);
File f = new File (ldifFile);
@@ -160,21 +160,21 @@
private boolean toBoolean(Entry entry, boolean defaultValue, String attrName)
{
- final AttributeType attrType = getSchema().getAttributeType(attrName);
+ final AttributeType attrType = getInstance().getServerContext().getSchema().getAttributeType(attrName);
final List<Attribute> attrs = entry.getAllAttributes(attrType);
return TaskUtils.getBoolean(attrs, defaultValue);
}
private ArrayList<String> toListOfString(Entry entry, String attrName)
{
- final AttributeType attrType = getSchema().getAttributeType(attrName);
+ final AttributeType attrType = getInstance().getServerContext().getSchema().getAttributeType(attrName);
final List<Attribute> attrs = entry.getAllAttributes(attrType);
return TaskUtils.getMultiValueString(attrs);
}
private String toString(Entry entry, String attrName)
{
- final AttributeType attrType = getSchema().getAttributeType(attrName);
+ final AttributeType attrType = getInstance().getServerContext().getSchema().getAttributeType(attrName);
final List<Attribute> attrs = entry.getAllAttributes(attrType);
return TaskUtils.getSingleValueString(attrs);
}
@@ -456,7 +456,7 @@
HashSet<AttributeType> attributes = new HashSet<>();
for (String attrName : attributeStrings)
{
- attributes.add(DirectoryServer.getSchema().getAttributeType(attrName));
+ attributes.add(DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType(attrName));
}
return attributes;
}
--
Gitblit v1.10.0