From 0032820dc9fbaa713d615168ffd11706ffe600bf Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 14 Aug 2013 11:15:32 +0000
Subject: [PATCH] ChangeNumber.java: In the ctor, renamed parameters. In other methods, used early exit.
---
opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangeNumber.java | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangeNumber.java b/opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangeNumber.java
index ac8c75f..21a590e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangeNumber.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/common/ChangeNumber.java
@@ -115,15 +115,15 @@
/**
* Create a new ChangeNumber.
*
- * @param time time for the ChangeNumber
- * @param seq sequence number
- * @param serverId2 identity of server
+ * @param timeStamp timeStamp for the ChangeNumber
+ * @param seqNum sequence number
+ * @param serverId identity of server
*/
- public ChangeNumber(long time, int seq, int serverId2)
+ public ChangeNumber(long timeStamp, int seqNum, int serverId)
{
- serverId = serverId2;
- timeStamp = time;
- seqnum = seq;
+ this.serverId = serverId;
+ this.timeStamp = timeStamp;
+ this.seqnum = seqNum;
}
/**
@@ -176,8 +176,7 @@
this.serverId == cn.serverId &&
this.timeStamp == cn.timeStamp;
}
- else
- return false;
+ return false;
}
/**
@@ -263,8 +262,7 @@
{
if (CN2 == null)
return 0;
- else
- return -1;
+ return -1;
}
else if (CN2 == null)
return 1;
@@ -327,14 +325,10 @@
if (seqnum2 <= seqnum1)
{
return seqnum1 - seqnum2;
- } else
- {
- return Integer.MAX_VALUE - (seqnum2 - seqnum1) + 1;
}
- } else
- {
- return 0;
+ return Integer.MAX_VALUE - (seqnum2 - seqnum1) + 1;
}
+ return 0;
}
/**
--
Gitblit v1.10.0