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/ReplServerStartDSMsg.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
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 ed64711..d36467f 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ReplServerStartDSMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ReplServerStartDSMsg.java
@@ -131,7 +131,7 @@
degradedStatusThreshold =scanner.nextIntUTF8();
weight = scanner.nextIntUTF8();
connectedDSNumber = scanner.nextIntUTF8();
- serverState = scanner.nextServerState();
+ serverState = scanner.nextServerStateMustComeLast();
}
/**
@@ -182,16 +182,15 @@
*/
final ByteArrayBuilder builder = new ByteArrayBuilder();
encodeHeader(MSG_TYPE_REPL_SERVER_START_DS, builder, protocolVersion);
- builder.append(baseDN);
- builder.appendUTF8(serverId);
- builder.append(serverURL);
- builder.appendUTF8(windowSize);
- builder.append(Boolean.toString(sslEncryption));
- builder.appendUTF8(degradedStatusThreshold);
- builder.appendUTF8(weight);
- builder.appendUTF8(connectedDSNumber);
- // 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.appendIntUTF8(weight);
+ builder.appendIntUTF8(connectedDSNumber);
+ builder.appendServerStateMustComeLast(serverState);
return builder.toByteArray();
}
--
Gitblit v1.10.0