From ed519feefd5b2b89097a9b2abcc34c56aea0f1be Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 03 Feb 2016 08:44:53 +0000
Subject: [PATCH] *.java: Removed DirectoryServer.getAttributeTypeOrNull(), replaced with DirectoryServer.getAttributeType()
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/EntryHistorical.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/EntryHistorical.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/EntryHistorical.java
index f33272d..7e7a894 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/EntryHistorical.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/EntryHistorical.java
@@ -269,7 +269,7 @@
*/
public static void setHistoricalAttrToOperation(PreOperationAddOperation addOperation)
{
- AttributeType attrType = DirectoryServer.getAttributeTypeOrNull(HISTORICAL_ATTRIBUTE_NAME);
+ AttributeType attrType = DirectoryServer.getAttributeType(HISTORICAL_ATTRIBUTE_NAME);
String attrValue = encodeHistorical(OperationContext.getCSN(addOperation), "add");
List<Attribute> attrs = Attributes.createAsList(attrType, attrValue);
addOperation.setAttribute(attrType, attrs);
@@ -357,8 +357,7 @@
purgeDate = TimeThread.getTime() - purgeDelayInMillisec;
}
- AttributeType historicalAttrType = DirectoryServer.getAttributeTypeOrNull(HISTORICAL_ATTRIBUTE_NAME);
- AttributeBuilder builder = new AttributeBuilder(historicalAttrType);
+ AttributeBuilder builder = new AttributeBuilder(HISTORICAL_ATTRIBUTE_NAME);
for (Map.Entry<AttributeDescription, AttrHistorical> mapEntry : attributesHistorical.entrySet())
{
@@ -685,7 +684,7 @@
*/
public static String getEntryUUID(Entry entry)
{
- AttributeType attrType = DirectoryServer.getAttributeTypeOrNull(ENTRYUUID_ATTRIBUTE_NAME);
+ AttributeType attrType = DirectoryServer.getAttributeType(ENTRYUUID_ATTRIBUTE_NAME);
List<Attribute> uuidAttrs = entry.getOperationalAttribute(attrType);
return extractEntryUUID(uuidAttrs, entry.getName());
}
@@ -700,7 +699,7 @@
*/
public static String getEntryUUID(PreOperationAddOperation op)
{
- AttributeType attrType = DirectoryServer.getAttributeTypeOrNull(ENTRYUUID_ATTRIBUTE_NAME);
+ AttributeType attrType = DirectoryServer.getAttributeType(ENTRYUUID_ATTRIBUTE_NAME);
List<Attribute> uuidAttrs = op.getOperationalAttributes().get(attrType);
return extractEntryUUID(uuidAttrs, op.getEntryDN());
}
--
Gitblit v1.10.0