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/SafeDataExpectedAcksInfo.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java b/opends/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
index b9bc509..5f55904 100644
--- a/opends/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
+++ b/opends/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
@@ -68,7 +68,7 @@
*/
public SafeDataExpectedAcksInfo(ChangeNumber changeNumber,
ServerHandler requesterServerHandler, byte safeDataLevel,
- List<Short> expectedServers)
+ List<Integer> expectedServers)
{
super(changeNumber, requesterServerHandler, AssuredMode.SAFE_DATA_MODE,
expectedServers);
@@ -95,7 +95,7 @@
}
// Get the ack status for the matching server
- short ackingServerId = ackingServer.getServerId();
+ int ackingServerId = ackingServer.getServerId();
boolean ackReceived = expectedServersAckStatus.get(ackingServerId);
if (ackReceived)
{
@@ -129,10 +129,10 @@
// Fill collected errors info
ack.setHasTimeout(true);
// Tell wich servers did not send an ack in time
- List<Short> failedServers = new ArrayList<Short>();
- Set<Short> serverIds = expectedServersAckStatus.keySet();
- serversInTimeout = new ArrayList<Short>(); // Use next loop to fill it
- for (Short serverId : serverIds)
+ List<Integer> failedServers = new ArrayList<Integer>();
+ Set<Integer> serverIds = expectedServersAckStatus.keySet();
+ serversInTimeout = new ArrayList<Integer>(); // Use next loop to fill it
+ for (Integer serverId : serverIds)
{
boolean ackReceived = expectedServersAckStatus.get(serverId);
if (!ackReceived)
--
Gitblit v1.10.0