From c015616756e6faa64060971753bc77978ae82dec Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Wed, 07 Oct 2009 12:19:42 +0000
Subject: [PATCH] The documentation and the configuration of a Replication Domain allow a maximum value of 65535 for the server-id property. Nevertheless, the server-id in the ReplicationDomain implementation is managed as a short allowing a maximum value of 32767.
---
opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java b/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java
index e4991cb..d93f93b 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ServerStartMsg.java
@@ -40,7 +40,7 @@
*/
public class ServerStartMsg extends StartMsg
{
- private short serverId; // Id of the LDAP server that sent this message
+ private int serverId; // Id of the LDAP server that sent this message
private String serverURL;
private String baseDn;
private int maxReceiveQueue;
@@ -67,7 +67,7 @@
* Server after being connected to a replication server for a given
* replication domain.
*
- * @param serverId The serverId of the server for which the ServerStartMsg
+ * @param serverId2 The serverId of the server for which the ServerStartMsg
* is created.
* @param baseDn The base DN.
* @param windowSize The window size used by this server.
@@ -79,7 +79,7 @@
* after the start messages have been exchanged.
* @param groupId The group id of the DS for this DN
*/
- public ServerStartMsg(short serverId, String baseDn, int windowSize,
+ public ServerStartMsg(int serverId2, String baseDn, int windowSize,
long heartbeatInterval,
ServerState serverState,
short protocolVersion,
@@ -89,7 +89,7 @@
{
super(protocolVersion, generationId);
- this.serverId = serverId;
+ this.serverId = serverId2;
this.baseDn = baseDn;
this.maxReceiveDelay = 0;
this.maxReceiveQueue = 0;
@@ -143,7 +143,7 @@
*/
length = getNextLength(in, pos);
String serverIdString = new String(in, pos, length, "UTF-8");
- serverId = Short.valueOf(serverIdString);
+ serverId = Integer.valueOf(serverIdString);
pos += length +1;
/*
@@ -221,7 +221,7 @@
* Get the ServerID from the message.
* @return the server ID
*/
- public short getServerId()
+ public int getServerId()
{
return serverId;
}
--
Gitblit v1.10.0