From f6f67fe1cb1f1f08c392de2e4565ec1a89dd182a 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] Remove unnecessary calls to DirectoryServer.getAttributeTypeOrDefault(String).
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 9 +++------
1 files changed, 3 insertions(+), 6 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 50244f1..368fe7e 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
@@ -2195,16 +2195,14 @@
conn, nextOperationID(), nextMessageID(), new ArrayList<Control>(0),
targetDN, newRDN, false, parentDN);
- AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(DS_SYNC_CONFLICT);
if (markConflict)
{
- Attribute attr =
- Attributes.create(attrType, targetDN.toString());
+ Attribute attr = Attributes.create(DS_SYNC_CONFLICT, targetDN.toString());
newOp.addModification(new Modification(ModificationType.REPLACE, attr));
}
else
{
- Attribute attr = Attributes.empty(attrType);
+ Attribute attr = Attributes.empty(DS_SYNC_CONFLICT);
newOp.addModification(new Modification(ModificationType.DELETE, attr));
}
@@ -3012,8 +3010,7 @@
private void markConflictEntry(Operation op, DN currentDN, DN conflictDN)
{
// create new internal modify operation and run it.
- AttributeType attrType = DirectoryServer.getAttributeTypeOrDefault(DS_SYNC_CONFLICT);
- Attribute attr = Attributes.create(attrType, conflictDN.toString());
+ Attribute attr = Attributes.create(DS_SYNC_CONFLICT, conflictDN.toString());
List<Modification> mods = newArrayList(new Modification(ModificationType.REPLACE, attr));
ModifyOperation newOp = new ModifyOperationBasis(
--
Gitblit v1.10.0