From 377b2709c64b32fe93905b466482216c2cc0581c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 19 Mar 2014 16:30:32 +0000
Subject: [PATCH] OPENDJ-1368 (CR-3232) Remove AttributeValue
---
opendj3-server-dev/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java
index 7ecc2a0..51e8647 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java
@@ -30,9 +30,13 @@
import java.util.Iterator;
import java.util.Map;
+import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ModificationType;
import org.opends.server.replication.common.CSN;
-import org.opends.server.types.*;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.Entry;
+import org.opends.server.types.Modification;
/**
* This class is used to store historical information for single valued
@@ -45,17 +49,17 @@
public class AttrHistoricalSingle extends AttrHistorical
{
/** Last time when the attribute was deleted. */
- private CSN deleteTime = null;
+ private CSN deleteTime;
/** Last time when a value was added. */
- private CSN addTime = null;
+ private CSN addTime;
/** Last added value. */
- private AttributeValue value = null;
+ private ByteString value;
/**
* last operation applied. This is only used for multiple mods on the same
* single valued attribute in the same modification.
*/
- private HistAttrModificationKey lastMod = null;
+ private HistAttrModificationKey lastMod;
/**
* {@inheritDoc}
@@ -89,7 +93,7 @@
@Override
public void processLocalOrNonConflictModification(CSN csn, Modification mod)
{
- AttributeValue newValue = null;
+ ByteString newValue = null;
Attribute modAttr = mod.getAttribute();
if (modAttr != null && !modAttr.isEmpty())
{
@@ -143,7 +147,7 @@
{
boolean conflict = false;
- AttributeValue newValue = null;
+ ByteString newValue = null;
Attribute modAttr = mod.getAttribute();
if (modAttr != null && !modAttr.isEmpty())
{
@@ -287,8 +291,7 @@
* {@inheritDoc}
*/
@Override
- public void assign(HistAttrModificationKey histKey,
- AttributeValue value, CSN csn)
+ public void assign(HistAttrModificationKey histKey, ByteString value, CSN csn)
{
switch (histKey)
{
--
Gitblit v1.10.0