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/TopologyMsg.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/TopologyMsg.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/TopologyMsg.java
index 56a1bbf..20ea943 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/TopologyMsg.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/TopologyMsg.java
@@ -208,24 +208,24 @@
* <number of following RSInfo entries>[<RSInfo>]*
*/
final ByteArrayBuilder builder = new ByteArrayBuilder();
- builder.append(MSG_TYPE_TOPOLOGY);
+ builder.appendByte(MSG_TYPE_TOPOLOGY);
// Put DS infos
- builder.append((byte) replicaInfos.size());
+ builder.appendByte((byte) replicaInfos.size());
for (DSInfo dsInfo : replicaInfos.values())
{
- builder.appendUTF8(dsInfo.getDsId());
+ builder.appendIntUTF8(dsInfo.getDsId());
if (version >= REPLICATION_PROTOCOL_V6)
{
- builder.append(dsInfo.getDsUrl());
+ builder.appendString(dsInfo.getDsUrl());
}
- builder.appendUTF8(dsInfo.getRsId());
- builder.appendUTF8(dsInfo.getGenerationId());
- builder.append(dsInfo.getStatus().getValue());
- builder.append(dsInfo.isAssured());
- builder.append(dsInfo.getAssuredMode().getValue());
- builder.append(dsInfo.getSafeDataLevel());
- builder.append(dsInfo.getGroupId());
+ builder.appendIntUTF8(dsInfo.getRsId());
+ builder.appendLongUTF8(dsInfo.getGenerationId());
+ builder.appendByte(dsInfo.getStatus().getValue());
+ builder.appendBoolean(dsInfo.isAssured());
+ builder.appendByte(dsInfo.getAssuredMode().getValue());
+ builder.appendByte(dsInfo.getSafeDataLevel());
+ builder.appendByte(dsInfo.getGroupId());
builder.appendStrings(dsInfo.getRefUrls());
@@ -236,22 +236,22 @@
{
builder.appendStrings(dsInfo.getEclIncludesForDeletes());
}
- builder.append((byte) dsInfo.getProtocolVersion());
+ builder.appendByte((byte) dsInfo.getProtocolVersion());
}
}
// Put RS infos
- builder.append((byte) rsInfos.size());
+ builder.appendByte((byte) rsInfos.size());
for (RSInfo rsInfo : rsInfos)
{
- builder.appendUTF8(rsInfo.getId());
- builder.appendUTF8(rsInfo.getGenerationId());
- builder.append(rsInfo.getGroupId());
+ builder.appendIntUTF8(rsInfo.getId());
+ builder.appendLongUTF8(rsInfo.getGenerationId());
+ builder.appendByte(rsInfo.getGroupId());
if (version >= REPLICATION_PROTOCOL_V4)
{
- builder.append(rsInfo.getServerUrl());
- builder.appendUTF8(rsInfo.getWeight());
+ builder.appendString(rsInfo.getServerUrl());
+ builder.appendIntUTF8(rsInfo.getWeight());
}
}
--
Gitblit v1.10.0