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/ReplServerStartMsg.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
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 5a58fd6..7a09ba5 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ReplServerStartMsg.java
@@ -125,7 +125,7 @@
degradedStatusThreshold = scanner.nextIntUTF8();
}
- serverState = scanner.nextServerState();
+ serverState = scanner.nextServerStateMustComeLast();
}
/**
@@ -177,13 +177,12 @@
* <operation type><basedn><serverid><serverURL><windowsize><serverState>
*/
encodeHeader_V1(MSG_TYPE_REPL_SERVER_START_V1, builder);
- builder.append(baseDN);
- builder.appendUTF8(serverId);
- builder.append(serverURL);
- builder.appendUTF8(windowSize);
- builder.append(Boolean.toString(sslEncryption));
- // Caution: ServerState MUST be the last field.
- builder.append(serverState);
+ builder.appendDN(baseDN);
+ builder.appendIntUTF8(serverId);
+ builder.appendString(serverURL);
+ builder.appendIntUTF8(windowSize);
+ builder.appendString(Boolean.toString(sslEncryption));
+ builder.appendServerStateMustComeLast(serverState);
}
else
{
@@ -192,14 +191,13 @@
* <degradedStatusThreshold><serverState>
*/
encodeHeader(MSG_TYPE_REPL_SERVER_START, builder, protocolVersion);
- builder.append(baseDN);
- builder.appendUTF8(serverId);
- builder.append(serverURL);
- builder.appendUTF8(windowSize);
- builder.append(Boolean.toString(sslEncryption));
- builder.appendUTF8(degradedStatusThreshold);
- // Caution: ServerState MUST be the last field.
- builder.append(serverState);
+ builder.appendDN(baseDN);
+ builder.appendIntUTF8(serverId);
+ builder.appendString(serverURL);
+ builder.appendIntUTF8(windowSize);
+ builder.appendString(Boolean.toString(sslEncryption));
+ builder.appendIntUTF8(degradedStatusThreshold);
+ builder.appendServerStateMustComeLast(serverState);
}
return builder.toByteArray();
}
--
Gitblit v1.10.0