From 0472508ea9c57e77d90b7a67ce9f161e6d7965f2 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 26 Sep 2013 10:22:46 +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/ServerStartMsg.java | 2 +-
opends/src/server/org/opends/server/replication/protocol/AddMsg.java | 2 +-
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/ReplServerStartDSMsg.java | 2 +-
opends/src/server/org/opends/server/replication/protocol/InitializeRequestMsg.java | 2 +-
opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java | 2 +-
opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java | 2 +-
opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java | 4 ++--
9 files changed, 11 insertions(+), 11 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 c6ea471..2ef3ccd 100644
--- a/opends/src/server/org/opends/server/replication/protocol/AddMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/AddMsg.java
@@ -180,7 +180,7 @@
AddOperation add = new AddOperationBasis(connection,
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(), null,
- ByteString.valueOf(newDN.toString()), attr);
+ ByteString.valueOf(newDN.toNormalizedString()), attr);
AddContext ctx = new AddContext(getCSN(), getEntryUUID(),
parentEntryUUID);
add.setAttachment(SYNCHROCONTEXT, ctx);
diff --git a/opends/src/server/org/opends/server/replication/protocol/InitializeRequestMsg.java b/opends/src/server/org/opends/server/replication/protocol/InitializeRequestMsg.java
index 0b99451..4c39fbf 100644
--- a/opends/src/server/org/opends/server/replication/protocol/InitializeRequestMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/InitializeRequestMsg.java
@@ -136,7 +136,7 @@
public byte[] getBytes(short version)
{
try {
- byte[] baseDNBytes = baseDN.toString().getBytes("UTF-8");
+ byte[] baseDNBytes = baseDN.toNormalizedString().getBytes("UTF-8");
byte[] senderBytes = String.valueOf(senderID).getBytes("UTF-8");
byte[] destinationBytes = String.valueOf(destination).getBytes("UTF-8");
byte[] initWindowBytes = null;
diff --git a/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java b/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java
index 6194c85..900ef0c 100644
--- a/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/InitializeTargetMsg.java
@@ -196,7 +196,7 @@
try
{
byte[] byteDestination = String.valueOf(destination).getBytes("UTF-8");
- byte[] byteDn = baseDN.toString().getBytes("UTF-8");
+ byte[] byteDn = baseDN.toNormalizedString().getBytes("UTF-8");
byte[] byteSender = String.valueOf(senderID).getBytes("UTF-8");
byte[] byteRequestor = String.valueOf(requestorID).getBytes("UTF-8");
byte[] byteEntryCount = String.valueOf(entryCount).getBytes("UTF-8");
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 b27f8b8..d92b6d6 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.toString().getBytes("UTF-8");
+ byte[] byteDn = dn.toNormalizedString().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.toString().getBytes("UTF-8");
+ byte[] byteDn = dn.toNormalizedString().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 ca16cd2..5509fcc 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.toString()),
+ ByteString.valueOf(newDN.toNormalizedString()),
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 b66947a..c66f645 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.toString()), ldapmods);
+ ByteString.valueOf(newDN.toNormalizedString()), ldapmods);
ModifyContext ctx = new ModifyContext(getCSN(), getEntryUUID());
mod.setAttachment(SYNCHROCONTEXT, ctx);
return mod;
diff --git a/opends/src/server/org/opends/server/replication/protocol/ReplServerStartDSMsg.java b/opends/src/server/org/opends/server/replication/protocol/ReplServerStartDSMsg.java
index a4c50a6..7cc148a 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ReplServerStartDSMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ReplServerStartDSMsg.java
@@ -261,7 +261,7 @@
* <degradedStatusThreshold><weight><connectedDSNumber>
* <serverState>
*/
- byte[] byteDn = baseDN.toString().getBytes("UTF-8");
+ byte[] byteDn = baseDN.toNormalizedString().getBytes("UTF-8");
byte[] byteServerId = String.valueOf(serverId).getBytes("UTF-8");
byte[] byteServerUrl = serverURL.getBytes("UTF-8");
byte[] byteServerState = serverState.getBytes();
diff --git a/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java b/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java
index 4547a9b..8b03beb 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java
@@ -325,7 +325,7 @@
* <degradedStatusThreshold><serverState>
*/
- byte[] byteDn = baseDN.toString().getBytes("UTF-8");
+ byte[] byteDn = baseDN.toNormalizedString().getBytes("UTF-8");
byte[] byteServerId = String.valueOf(serverId).getBytes("UTF-8");
byte[] byteServerUrl = serverURL.getBytes("UTF-8");
byte[] byteServerState = serverState.getBytes();
@@ -446,7 +446,7 @@
* <operation type><basedn><serverid><serverURL><windowsize><serverState>
*/
try {
- byte[] byteDn = baseDN.toString().getBytes("UTF-8");
+ byte[] byteDn = baseDN.toNormalizedString().getBytes("UTF-8");
byte[] byteServerId = String.valueOf(serverId).getBytes("UTF-8");
byte[] byteServerUrl = serverURL.getBytes("UTF-8");
byte[] byteServerState = serverState.getBytes();
diff --git a/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java b/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java
index 40388d7..469e8f6 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java
@@ -292,7 +292,7 @@
public byte[] getBytes(short sessionProtocolVersion)
{
try {
- byte[] byteDn = baseDN.toString().getBytes("UTF-8");
+ byte[] byteDn = baseDN.toNormalizedString().getBytes("UTF-8");
byte[] byteServerId = String.valueOf(serverId).getBytes("UTF-8");
byte[] byteServerUrl = serverURL.getBytes("UTF-8");
byte[] byteMaxRecvDelay =
--
Gitblit v1.10.0