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/SafeReadExpectedAcksInfo.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java b/opends/src/server/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java
index 2d0bed0..af302f1 100644
--- a/opends/src/server/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java
+++ b/opends/src/server/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java
@@ -62,7 +62,7 @@
// The list of server ids that had errors for the sent matching update
// Each server id of the list had one of the
// 3 possible errors (timeout, wrong status or replay error)
- private List<Short> failedServers = new ArrayList<Short>();
+ private List<Integer> failedServers = new ArrayList<Integer>();
/**
* Number of servers we want an ack from and from which we received the ack.
@@ -85,8 +85,8 @@
* returning ack we gonna compute
*/
public SafeReadExpectedAcksInfo(ChangeNumber changeNumber,
- ServerHandler requesterServerHandler, List<Short> expectedServers,
- List<Short> wrongStatusServers)
+ ServerHandler requesterServerHandler, List<Integer> expectedServers,
+ List<Integer> wrongStatusServers)
{
super(changeNumber, requesterServerHandler, AssuredMode.SAFE_READ_MODE,
expectedServers);
@@ -159,7 +159,7 @@
public boolean processReceivedAck(ServerHandler ackingServer, AckMsg ackMsg)
{
// Get the ack status for the matching server
- short ackingServerId = ackingServer.getServerId();
+ int ackingServerId = ackingServer.getServerId();
boolean ackReceived = expectedServersAckStatus.get(ackingServerId);
if (ackReceived)
{
@@ -219,9 +219,9 @@
ack.setHasTimeout(true);
// Add servers that did not respond in time
- Set<Short> serverIds = expectedServersAckStatus.keySet();
- serversInTimeout = new ArrayList<Short>(); // Use next loop to fill it
- for (Short serverId : serverIds)
+ Set<Integer> serverIds = expectedServersAckStatus.keySet();
+ serversInTimeout = new ArrayList<Integer>(); // Use next loop to fill it
+ for (int serverId : serverIds)
{
boolean ackReceived = expectedServersAckStatus.get(serverId);
if (!ackReceived)
--
Gitblit v1.10.0