From 09fcb137f6d46e0c32f03b0313ac445a2ee7ecc3 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Mon, 25 Sep 2006 09:03:39 +0000
Subject: [PATCH] Implement test suite for org.opends.server.types.AttributeType and make it immutable (it's still not 100% immutable - the constructors do not perform deep copies of the extra properties).
---
opends/src/server/org/opends/server/synchronization/Historical.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/synchronization/Historical.java b/opends/src/server/org/opends/server/synchronization/Historical.java
index 834e905..9b017fe 100644
--- a/opends/src/server/org/opends/server/synchronization/Historical.java
+++ b/opends/src/server/org/opends/server/synchronization/Historical.java
@@ -345,7 +345,7 @@
String strValue;
if (valInfo.getValueDeleteTime() != null)
{
- strValue = type.getLowerName() + optionsString + ":" +
+ strValue = type.getNormalizedPrimaryName() + optionsString + ":" +
valInfo.getValueDeleteTime().toString() +
":del:" + valInfo.getValue().toString();
AttributeValue val = new AttributeValue(historicalAttrType,
@@ -356,14 +356,14 @@
{
if (delAttr && valInfo.getValueUpdateTime() == deleteTime)
{
- strValue = type.getLowerName() + optionsString + ":" +
+ strValue = type.getNormalizedPrimaryName() + optionsString + ":" +
valInfo.getValueUpdateTime().toString() + ":repl:" +
valInfo.getValue().toString();
delAttr = false;
}
else
{
- strValue = type.getLowerName() + optionsString + ":" +
+ strValue = type.getNormalizedPrimaryName() + optionsString + ":" +
valInfo.getValueUpdateTime().toString() +
":add:" + valInfo.getValue().toString();
}
@@ -376,8 +376,9 @@
if (delAttr)
{
- String strValue = type.getLowerName() + optionsString + ":"
- + deleteTime.toString() + ":attrDel";
+ String strValue = type.getNormalizedPrimaryName()
+ + optionsString + ":" + deleteTime.toString()
+ + ":attrDel";
delAttr = false;
AttributeValue val = new AttributeValue(historicalAttrType, strValue);
hist.add(val);
--
Gitblit v1.10.0