From db77f058c92ee3d0b531c474093d6a3d1d81cd25 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 26 May 2014 12:17:41 +0000
Subject: [PATCH] Ensured no accidental protocol break can happen by renaming all ByteArrayBuilder.append*() methods and getting rid of all method overloading.
---
opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
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 d8da663..153e0c4 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ModifyDNMsg.java
@@ -180,10 +180,10 @@
public byte[] getBytes_V1()
{
final ByteArrayBuilder builder = encodeHeader_V1(MSG_TYPE_MODIFYDN_V1);
- builder.append(newRDN);
- builder.append(newSuperior);
- builder.append(newSuperiorEntryUUID);
- builder.append(deleteOldRdn);
+ builder.appendString(newRDN);
+ builder.appendString(newSuperior);
+ builder.appendString(newSuperiorEntryUUID);
+ builder.appendBoolean(deleteOldRdn);
return builder.toByteArray();
}
@@ -193,11 +193,11 @@
{
final ByteArrayBuilder builder =
encodeHeader(MSG_TYPE_MODIFYDN,ProtocolVersion.REPLICATION_PROTOCOL_V3);
- builder.append(newRDN);
- builder.append(newSuperior);
- builder.append(newSuperiorEntryUUID);
- builder.append(deleteOldRdn);
- builder.appendZeroTerminated(encodedMods);
+ builder.appendString(newRDN);
+ builder.appendString(newSuperior);
+ builder.appendString(newSuperiorEntryUUID);
+ builder.appendBoolean(deleteOldRdn);
+ builder.appendZeroTerminatedByteArray(encodedMods);
return builder.toByteArray();
}
@@ -207,14 +207,14 @@
{
final ByteArrayBuilder builder =
encodeHeader(MSG_TYPE_MODIFYDN, protocolVersion);
- builder.append(newRDN);
- builder.append(newSuperior);
- builder.append(newSuperiorEntryUUID);
- builder.append(deleteOldRdn);
- builder.appendUTF8(encodedMods.length);
- builder.appendZeroTerminated(encodedMods);
- builder.appendUTF8(encodedEclIncludes.length);
- builder.appendZeroTerminated(encodedEclIncludes);
+ builder.appendString(newRDN);
+ builder.appendString(newSuperior);
+ builder.appendString(newSuperiorEntryUUID);
+ builder.appendBoolean(deleteOldRdn);
+ builder.appendIntUTF8(encodedMods.length);
+ builder.appendZeroTerminatedByteArray(encodedMods);
+ builder.appendIntUTF8(encodedEclIncludes.length);
+ builder.appendZeroTerminatedByteArray(encodedEclIncludes);
return builder.toByteArray();
}
--
Gitblit v1.10.0