From b0412cff62077d4c8118381dcae27b52178f1a43 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 06 Jun 2014 13:12:34 +0000
Subject: [PATCH] OPENDJ-1453 (CR-3697) Change time heart beat change numbers should be synced with updates
---
opendj-sdk/opends/src/server/org/opends/server/replication/common/CSNGenerator.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/common/CSNGenerator.java b/opendj-sdk/opends/src/server/org/opends/server/replication/common/CSNGenerator.java
index 205f0dc..33ea83d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/common/CSNGenerator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/common/CSNGenerator.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.common;
@@ -44,7 +44,7 @@
* @see #lastTime
*/
private int seqnum;
- private int serverId;
+ private final int serverId;
/**
* Create a new {@link CSNGenerator}.
@@ -64,12 +64,12 @@
/**
* Create a new {@link CSNGenerator}.
*
- * @param id id to use when creating {@link CSN}s.
+ * @param serverId serverId to use when creating {@link CSN}s.
* @param state This generator will be created in a way that makes sure that
* all {@link CSN}s generated will be larger than all the
* {@link CSN}s currently in state.
*/
- public CSNGenerator(int id, ServerState state)
+ public CSNGenerator(int serverId, ServerState state)
{
this.lastTime = TimeThread.getTime();
for (CSN csn : state)
@@ -78,12 +78,12 @@
{
this.lastTime = csn.getTime();
}
- if (csn.getServerId() == id)
+ if (csn.getServerId() == serverId)
{
this.seqnum = csn.getSeqnum();
}
}
- this.serverId = id;
+ this.serverId = serverId;
}
/**
@@ -104,7 +104,7 @@
lastTime = curTime;
}
- if (++seqnum <= 0)
+ if (++seqnum <= 0) // check no underflow happened
{
seqnum = 0;
lastTime++;
@@ -155,7 +155,7 @@
lastTime = ++rcvdTime;
}
- if ((serverId == changeServerId) && (seqnum < changeSeqNum))
+ if (serverId == changeServerId && seqnum < changeSeqNum)
{
seqnum = changeSeqNum;
}
--
Gitblit v1.10.0