From 46fd9423ab622d7f9531aa1564846ec52fe09534 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 24 Apr 2013 12:44:51 +0000
Subject: [PATCH] Replication Cleanup.
---
opends/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java | 9 +++------
1 files changed, 3 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 5f55904..305196b 100644
--- a/opends/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
+++ b/opends/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.server.replication.server;
@@ -106,14 +107,10 @@
return false;
} else
{
-
// Mark this ack received for the server
expectedServersAckStatus.put(ackingServerId, true);
numReceivedAcks++;
- if (numReceivedAcks == safeDataLevel)
- return true;
- else
- return false;
+ return numReceivedAcks == safeDataLevel;
}
}
@@ -128,7 +125,7 @@
{
// Fill collected errors info
ack.setHasTimeout(true);
- // Tell wich servers did not send an ack in time
+ // Tell which servers did not send an ack in time
List<Integer> failedServers = new ArrayList<Integer>();
Set<Integer> serverIds = expectedServersAckStatus.keySet();
serversInTimeout = new ArrayList<Integer>(); // Use next loop to fill it
--
Gitblit v1.10.0