From c5740d7b39334af983957a9c284ddd792d598f6c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 10 Jul 2015 15:13:20 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 04a084b..203e218 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -2177,8 +2177,7 @@
conn, nextOperationID(), nextMessageID(), new ArrayList<Control>(0),
targetDN, newRDN, false, parentDN);
- AttributeType attrType =
- DirectoryServer.getAttributeType(DS_SYNC_CONFLICT, true);
+ AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(DS_SYNC_CONFLICT);
if (markConflict)
{
Attribute attr =
@@ -3003,7 +3002,7 @@
private void markConflictEntry(Operation op, DN currentDN, DN conflictDN)
{
// create new internal modify operation and run it.
- AttributeType attrType = DirectoryServer.getAttributeType(DS_SYNC_CONFLICT, true);
+ AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(DS_SYNC_CONFLICT);
Attribute attr = Attributes.create(attrType, conflictDN.toString());
List<Modification> mods = newArrayList(new Modification(ModificationType.REPLACE, attr));
@@ -3429,7 +3428,7 @@
Set<AttributeType> includeAttributes = new HashSet<>();
for (String attrName : includeAttributeStrings)
{
- includeAttributes.add(DirectoryServer.getAttributeType(attrName, true));
+ includeAttributes.add(DirectoryServer.getAttributeTypeOrDefault(attrName));
}
exportConfig.setIncludeAttributes(includeAttributes);
}
--
Gitblit v1.10.0