From 49f8f06c0fed42adbe430e664c1c47c7e500fde3 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 11 Oct 2013 09:58:45 +0000
Subject: [PATCH] OPENDJ-1134 (CR-2355) Introduce a class in replication for encapsulating host+port combinations
---
opends/src/server/org/opends/server/replication/protocol/AddMsg.java | 5 ++---
opends/src/server/org/opends/server/replication/protocol/LDAPUpdateMsg.java | 4 ++--
opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java | 2 +-
opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/AddMsg.java b/opends/src/server/org/opends/server/replication/protocol/AddMsg.java
index 2ef3ccd..bad0926 100644
--- a/opends/src/server/org/opends/server/replication/protocol/AddMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/AddMsg.java
@@ -180,9 +180,8 @@
AddOperation add = new AddOperationBasis(connection,
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(), null,
- ByteString.valueOf(newDN.toNormalizedString()), attr);
- AddContext ctx = new AddContext(getCSN(), getEntryUUID(),
- parentEntryUUID);
+ ByteString.valueOf(newDN.toString()), attr);
+ AddContext ctx = new AddContext(getCSN(), getEntryUUID(), parentEntryUUID);
add.setAttachment(SYNCHROCONTEXT, ctx);
return add;
}
diff --git a/opends/src/server/org/opends/server/replication/protocol/LDAPUpdateMsg.java b/opends/src/server/org/opends/server/replication/protocol/LDAPUpdateMsg.java
index d92b6d6..b27f8b8 100644
--- a/opends/src/server/org/opends/server/replication/protocol/LDAPUpdateMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/LDAPUpdateMsg.java
@@ -237,7 +237,7 @@
public byte[] encodeHeader(byte type, int additionalLength, short version)
throws UnsupportedEncodingException
{
- byte[] byteDn = dn.toNormalizedString().getBytes("UTF-8");
+ byte[] byteDn = dn.toString().getBytes("UTF-8");
byte[] csnByte = getCSN().toString().getBytes("UTF-8");
byte[] byteEntryuuid = getEntryUUID().getBytes("UTF-8");
@@ -297,7 +297,7 @@
public byte[] encodeHeader_V1(byte type, int additionalLength)
throws UnsupportedEncodingException
{
- byte[] byteDn = dn.toNormalizedString().getBytes("UTF-8");
+ byte[] byteDn = dn.toString().getBytes("UTF-8");
byte[] csnByte = getCSN().toString().getBytes("UTF-8");
byte[] byteEntryuuid = getEntryUUID().getBytes("UTF-8");
diff --git a/opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java b/opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
index 5509fcc..ca16cd2 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
@@ -165,7 +165,7 @@
ModifyDNOperation moddn = new ModifyDNOperationBasis(connection,
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(), null,
- ByteString.valueOf(newDN.toNormalizedString()),
+ ByteString.valueOf(newDN.toString()),
ByteString.valueOf(newRDN),
deleteOldRdn,
(newSuperior == null ? null : ByteString.valueOf(newSuperior)));
diff --git a/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java b/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java
index c66f645..b66947a 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ModifyMsg.java
@@ -137,7 +137,7 @@
ModifyOperation mod = new ModifyOperationBasis(connection,
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(), null,
- ByteString.valueOf(newDN.toNormalizedString()), ldapmods);
+ ByteString.valueOf(newDN.toString()), ldapmods);
ModifyContext ctx = new ModifyContext(getCSN(), getEntryUUID());
mod.setAttachment(SYNCHROCONTEXT, ctx);
return mod;
--
Gitblit v1.10.0