From b2efaf7ba0228d844773bb6c350806015069ea59 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 18 Aug 2015 14:51:20 +0000
Subject: [PATCH] AttrHistoricalSingle.java: In processLocalOrNonConflictModification(), made the code more explicit + prevented double assignment
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 d4ee62f..9b6291f 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
@@ -110,10 +110,11 @@
}
else
{
- this.deleteTime = addTime = csn;
+ this.addTime = csn;
+ this.deleteTime = csn;
+ this.value = newValue;
lastMod = REPL;
}
- this.value = newValue;
break;
case INCREMENT:
@@ -302,4 +303,29 @@
break;
}
}
+
+ @Override
+ public String toString()
+ {
+ final StringBuilder sb = new StringBuilder();
+ if (deleteTime != null)
+ {
+ sb.append("deleteTime=").append(deleteTime);
+ }
+ if (addTime != null)
+ {
+ if (sb.length() > 0)
+ {
+ sb.append(", ");
+ }
+ sb.append("addTime=").append(addTime);
+ }
+ if (sb.length() > 0)
+ {
+ sb.append(", ");
+ }
+ sb.append("value=").append(value)
+ .append(", lastMod=").append(lastMod);
+ return getClass().getSimpleName() + "(" + sb + ")";
+ }
}
--
Gitblit v1.10.0