From 157717b205d4c1f957cf810e04e06f11530c619c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 02 Sep 2013 08:57:43 +0000
Subject: [PATCH] Renamed: - ChangeNumber to CSN - ChangeNumberGenerator to CSNGenerator - ChangeNumberTest to CSNTest - ChangeNumberGeneratorTest to CSNGeneratorTest
---
opends/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 305196b..698a18e 100644
--- a/opends/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
+++ b/opends/src/server/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
@@ -31,13 +31,14 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.replication.common.AssuredMode;
-import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.AckMsg;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+
/**
* This class holds every info needed about the expected acks for a received
* update message requesting assured replication with Safe Data sub-mode.
@@ -51,27 +52,29 @@
*/
private static final DebugTracer TRACER = getTracer();
- // Requested level of safe data when the update message was received.
- private byte safeDataLevel = (byte)-1;
+ /** Requested level of safe data when the update message was received. */
+ private byte safeDataLevel = -1;
- // Number of received acks for the matching update message, up to now
- // Already set to 1 as the local RS receiving the message from a DS counts.
- private byte numReceivedAcks = (byte)1;
+ /**
+ * Number of received acks for the matching update message, up to now Already
+ * set to 1 as the local RS receiving the message from a DS counts.
+ */
+ private byte numReceivedAcks = 1;
/**
* Creates a new SafeDataExpectedAcksInfo.
- * @param changeNumber The change number of the assured update message
+ * @param csn The CSN of the assured update message
* @param requesterServerHandler The server that sent the assured update
* message
* @param safeDataLevel The Safe Data level requested for the assured
* update message
* @param expectedServers The list of servers we want an ack from
*/
- public SafeDataExpectedAcksInfo(ChangeNumber changeNumber,
+ public SafeDataExpectedAcksInfo(CSN csn,
ServerHandler requesterServerHandler, byte safeDataLevel,
List<Integer> expectedServers)
{
- super(changeNumber, requesterServerHandler, AssuredMode.SAFE_DATA_MODE,
+ super(csn, requesterServerHandler, AssuredMode.SAFE_DATA_MODE,
expectedServers);
this.safeDataLevel = safeDataLevel;
}
@@ -79,7 +82,8 @@
/**
* {@inheritDoc}
*/
- public boolean processReceivedAck(ServerHandler ackingServer, AckMsg ackMsg)
+ @Override
+ public boolean processReceivedAck(ServerHandler ackingServer, AckMsg ackMsg)
{
/*
* Security: although a DS should not respond to an update message sent to
@@ -117,9 +121,10 @@
/**
* {@inheritDoc}
*/
+ @Override
public AckMsg createAck(boolean timeout)
{
- AckMsg ack = new AckMsg(changeNumber);
+ AckMsg ack = new AckMsg(csn);
if (timeout)
{
--
Gitblit v1.10.0