From 39cfb739395cca91589c958fda4790c87ce0c9c8 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 02 Jan 2015 14:42:16 +0000
Subject: [PATCH] OPENDJ-1585 Re-implement DN normalization in server
---
opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 8c61a30..f8aacc7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -2225,7 +2225,7 @@
if (markConflict)
{
Attribute attr =
- Attributes.create(attrType, targetDN.toNormalizedString());
+ Attributes.create(attrType, targetDN.toString());
newOp.addModification(new Modification(ModificationType.REPLACE, attr));
}
else
@@ -2954,7 +2954,7 @@
{
addConflict(msg);
String conflictRDN =
- generateConflictRDN(entryUUID, msg.getDN().toNormalizedString());
+ generateConflictRDN(entryUUID, msg.getDN().toString());
msg.setDN(DN.valueOf(conflictRDN));
numUnresolvedNamingConflicts.incrementAndGet();
return false;
@@ -3054,7 +3054,7 @@
// create new internal modify operation and run it.
AttributeType attrType = DirectoryServer.getAttributeType(DS_SYNC_CONFLICT,
true);
- Attribute attr = Attributes.create(attrType, conflictDN.toNormalizedString());
+ Attribute attr = Attributes.create(attrType, conflictDN.toString());
List<Modification> mods =
newList(new Modification(ModificationType.REPLACE, attr));
@@ -3087,7 +3087,7 @@
*/
private void addConflict(AddMsg msg) throws DecodeException
{
- String normalizedDN = msg.getDN().toNormalizedString();
+ String normalizedDN = msg.getDN().toString();
// Generate an alert to let the administrator know that some
// conflict could not be solved.
--
Gitblit v1.10.0