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/common/ChangeNumber.java | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/common/ChangeNumber.java b/opends/src/server/org/opends/server/replication/common/ChangeNumber.java
index 03315d3..27347b7 100644
--- a/opends/src/server/org/opends/server/replication/common/ChangeNumber.java
+++ b/opends/src/server/org/opends/server/replication/common/ChangeNumber.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.server.replication.common;
@@ -121,12 +122,9 @@
if (obj instanceof ChangeNumber)
{
ChangeNumber cn = (ChangeNumber) obj;
- if ((this.seqnum == cn.seqnum) &&
- (this.serverId == cn.serverId) &&
- (this.timeStamp == cn.timeStamp) )
- return true;
- else
- return false;
+ return this.seqnum == cn.seqnum &&
+ this.serverId == cn.serverId &&
+ this.timeStamp == cn.timeStamp;
}
else
return false;
@@ -274,10 +272,7 @@
*/
public Boolean older(ChangeNumber CN)
{
- if (compare(this, CN) < 0)
- return true;
-
- return false;
+ return compare(this, CN) < 0;
}
/**
@@ -288,10 +283,7 @@
*/
public Boolean olderOrEqual(ChangeNumber CN)
{
- if (compare(this, CN) <= 0)
- return true;
-
- return false;
+ return compare(this, CN) <= 0;
}
/**
@@ -301,10 +293,7 @@
*/
public boolean newerOrEquals(ChangeNumber CN)
{
- if (compare(this, CN) >= 0)
- return true;
-
- return false;
+ return compare(this, CN) >= 0;
}
/**
@@ -314,10 +303,7 @@
*/
public boolean newer(ChangeNumber CN)
{
- if (compare(this, CN) > 0)
- return true;
-
- return false;
+ return compare(this, CN) > 0;
}
/**
--
Gitblit v1.10.0