From a41662c1136b2bb4a4198df89e0e87d2be3ef099 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 14:57:56 +0000
Subject: [PATCH] AutoRefactor'ed simplify expressions
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java
index 473fd70..e8c2833 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java
@@ -163,8 +163,8 @@
conflict = true;
modsIterator.remove();
}
- else if ((newValue != null) &&
- (!modifiedEntry.hasValue(type, modAttr.getOptions(), newValue)))
+ else if (newValue != null &&
+ !modifiedEntry.hasValue(type, modAttr.getOptions(), newValue))
{
conflict = true;
modsIterator.remove();
@@ -184,8 +184,8 @@
}
else if (csn.equals(addTime))
{
- if ((lastMod == HistAttrModificationKey.ADD)
- || (lastMod == HistAttrModificationKey.REPL))
+ if (lastMod == HistAttrModificationKey.ADD
+ || lastMod == HistAttrModificationKey.REPL)
{
if (csn.isNewerThan(deleteTime))
{
@@ -220,7 +220,7 @@
else
{
if (csn.isNewerThanOrEqualTo(deleteTime)
- && ((addTime == null ) || addTime.isOlderThan(deleteTime)))
+ && (addTime == null || addTime.isOlderThan(deleteTime)))
{
// no conflict : don't do anything beside setting the addTime
addTime = csn;
@@ -231,7 +231,7 @@
{
// Case where CSN = addTime = deleteTime
if (csn.equals(deleteTime) && csn.equals(addTime)
- && (lastMod == HistAttrModificationKey.DEL))
+ && lastMod == HistAttrModificationKey.DEL)
{
// No conflict, record the new value.
value = newValue;
--
Gitblit v1.10.0