From 8ca747546ddda3f83a3d4b7ccefefb345d713950 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Wed, 01 May 2013 08:19:06 +0000
Subject: [PATCH] Back out commits 8812-8814
---
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java
index 791c6ab..8cc59ea 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrHistoricalSingle.java
@@ -27,9 +27,8 @@
*/
package org.opends.server.replication.plugin;
-import java.util.HashMap;
+import java.util.ArrayList;
import java.util.Iterator;
-import java.util.Map;
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.types.Attribute;
@@ -49,17 +48,13 @@
*/
public class AttrHistoricalSingle extends AttrHistorical
{
- /** Last time when the attribute was deleted. */
- private ChangeNumber deleteTime = null;
- /** Last time when a value was added. */
- private ChangeNumber addTime = null;
- /** Last added value. */
- private AttributeValue value = null;
+ private ChangeNumber deleteTime = null; // last time when the attribute was
+ // deleted
+ private ChangeNumber addTime = null; // last time when a value was added
+ private AttributeValue value = null; // last added value
- /**
- * last operation applied. This is only used for multiple mods on the same
- * single valued attribute in the same modification.
- */
+ // last operation applied. This is only used for multiple mods on the same
+ // single valued attribute in the same modification.
private HistAttrModificationKey lastMod = null;
/**
@@ -75,18 +70,17 @@
* {@inheritDoc}
*/
@Override
- public Map<AttrValueHistorical, AttrValueHistorical> getValuesHistorical()
+ public ArrayList<AttrValueHistorical> getValuesHistorical()
{
if (addTime == null)
{
- return new HashMap<AttrValueHistorical,AttrValueHistorical>(0);
+ return new ArrayList<AttrValueHistorical>();
}
else
{
- HashMap<AttrValueHistorical,AttrValueHistorical> values =
- new HashMap<AttrValueHistorical,AttrValueHistorical>(1);
- AttrValueHistorical val = new AttrValueHistorical(value, addTime, null);
- values.put(val, val);
+ ArrayList<AttrValueHistorical> values =
+ new ArrayList<AttrValueHistorical>();
+ values.add(new AttrValueHistorical(value, addTime, null));
return values;
}
}
--
Gitblit v1.10.0