From 34b97b2d33a1196d3b22bd0ade1e758be613f7f3 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 06 Jun 2014 14:37:42 +0000
Subject: [PATCH] Ensured no accidental protocol break can happen by renaming all ByteArrayBuilder.append*() methods and getting rid of all method overloading.
---
opendj3-server-dev/src/server/org/opends/server/replication/protocol/MonitorMsg.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/MonitorMsg.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/MonitorMsg.java
index 854c3d9..9c73aa0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/MonitorMsg.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/MonitorMsg.java
@@ -274,7 +274,7 @@
try
{
final ByteArrayBuilder builder = new ByteArrayBuilder();
- builder.append(MSG_TYPE_REPL_SERVER_MONITOR);
+ builder.appendByte(MSG_TYPE_REPL_SERVER_MONITOR);
append(builder, senderID, protocolVersion);
append(builder, destination, protocolVersion);
@@ -298,7 +298,7 @@
if (protocolVersion == ProtocolVersion.REPLICATION_PROTOCOL_V1)
{
// legacy coding mistake
- builder.append((byte) 0);
+ builder.appendByte((byte) 0);
}
return builder.toByteArray();
}
@@ -313,15 +313,15 @@
{
if (protocolVersion == ProtocolVersion.REPLICATION_PROTOCOL_V1)
{
- builder.appendUTF8(data);
+ builder.appendIntUTF8(data);
}
else if (protocolVersion <= ProtocolVersion.REPLICATION_PROTOCOL_V3)
{
- builder.append((short) data);
+ builder.appendShort((short) data);
}
else // protocolVersion >= ProtocolVersion.REPLICATION_PROTOCOL_V4
{
- builder.append(data);
+ builder.appendInt(data);
}
}
--
Gitblit v1.10.0