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/server/DataServerHandler.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java b/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
index e7f00f0..3cd91c4 100644
--- a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
@@ -91,7 +91,7 @@
ProtocolSession session,
int queueSize,
String replicationServerURL,
- short replicationServerId,
+ int replicationServerId,
ReplicationServer replicationServer,
int rcvWindowSize)
{
@@ -182,10 +182,10 @@
// Prevent useless error message (full update status cannot lead to bad
// gen status)
Message message = NOTE_BAD_GEN_ID_IN_FULL_UPDATE.get(
- Short.toString(replicationServerDomain.
+ Integer.toString(replicationServerDomain.
getReplicationServer().getServerId()),
getServiceId().toString(),
- Short.toString(serverId),
+ Integer.toString(serverId),
Long.toString(generationId),
Long.toString(newGenId));
logError(message);
@@ -197,7 +197,7 @@
if (newStatus == ServerStatus.INVALID_STATUS)
{
Message msg = ERR_RS_CANNOT_CHANGE_STATUS.get(getServiceId().toString(),
- Short.toString(serverId), status.toString(), event.toString());
+ Integer.toString(serverId), status.toString(), event.toString());
logError(msg);
return;
}
@@ -235,7 +235,7 @@
if (newStatus == ServerStatus.INVALID_STATUS)
{
Message msg = ERR_RS_CANNOT_CHANGE_STATUS.get(getServiceId().toString(),
- Short.toString(serverId), status.toString(), event.toString());
+ Integer.toString(serverId), status.toString(), event.toString());
logError(msg);
// Status analyzer must only change from NORMAL_STATUS to DEGRADED_STATUS
// and vice versa. We may are being trying to change the status while for
@@ -387,7 +387,7 @@
if (event == StatusMachineEvent.INVALID_EVENT)
{
Message msg = ERR_RS_INVALID_NEW_STATUS.get(reqStatus.toString(),
- getServiceId().toString(), Short.toString(serverId));
+ getServiceId().toString(), Integer.toString(serverId));
logError(msg);
return ServerStatus.INVALID_STATUS;
}
@@ -397,7 +397,7 @@
if (newStatus == ServerStatus.INVALID_STATUS)
{
Message msg = ERR_RS_CANNOT_CHANGE_STATUS.get(getServiceId().toString(),
- Short.toString(serverId), status.toString(), event.toString());
+ Integer.toString(serverId), status.toString(), event.toString());
logError(msg);
return ServerStatus.INVALID_STATUS;
}
@@ -443,7 +443,7 @@
public void registerIntoDomain()
{
// All-right, connected with new DS: store handler.
- Map<Short, DataServerHandler> connectedDSs =
+ Map<Integer, DataServerHandler> connectedDSs =
replicationServerDomain.getConnectedDSs();
connectedDSs.put(serverId, this);
@@ -642,7 +642,7 @@
Message message = ERR_RS_INVALID_INIT_STATUS.get(
this.status.toString(),
getServiceId().toString(),
- Short.toString(serverId));
+ Integer.toString(serverId));
throw new DirectoryException(ResultCode.OTHER, message);
}
this.refUrls = startSessionMsg.getReferralsURLs();
@@ -668,7 +668,7 @@
{
Message message = NOTE_BAD_GENERATION_ID_FROM_DS.get(
getServiceId(),
- Short.toString(serverId),
+ Integer.toString(serverId),
Long.toString(generationId),
Long.toString(localGenerationId));
logError(message);
@@ -683,7 +683,7 @@
// it is not expected to connect to an empty RS
Message message = NOTE_BAD_GENERATION_ID_FROM_DS.get(
getServiceId(),
- Short.toString(serverId),
+ Integer.toString(serverId),
Long.toString(generationId),
Long.toString(localGenerationId));
logError(message);
--
Gitblit v1.10.0