From 063b1432ef622fc6b25a1bb7436685827d3d4c48 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Wed, 06 Sep 2006 06:45:33 +0000
Subject: [PATCH] Minor modification: - code cleaning - code improvement
---
opends/src/server/org/opends/server/synchronization/ValueInfo.java | 11 +++++++++--
opends/src/server/org/opends/server/synchronization/AttrInfo.java | 9 ++++-----
opends/src/server/org/opends/server/synchronization/ChangeNumber.java | 7 ++++++-
opends/src/server/org/opends/server/synchronization/AckMessage.java | 1 -
opends/src/server/org/opends/server/synchronization/Historical.java | 3 +--
5 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/synchronization/AckMessage.java b/opends/src/server/org/opends/server/synchronization/AckMessage.java
index 2854422..f1e72d5 100644
--- a/opends/src/server/org/opends/server/synchronization/AckMessage.java
+++ b/opends/src/server/org/opends/server/synchronization/AckMessage.java
@@ -113,7 +113,6 @@
/* put the type of the operation */
resultByteArray[0] = MSG_TYPE_ACK;
- resultByteArray[pos++] = 0;
/* put the ChangeNumber */
byte[] changeNumberByte;
diff --git a/opends/src/server/org/opends/server/synchronization/AttrInfo.java b/opends/src/server/org/opends/server/synchronization/AttrInfo.java
index 74b2e4e..52f4ead 100644
--- a/opends/src/server/org/opends/server/synchronization/AttrInfo.java
+++ b/opends/src/server/org/opends/server/synchronization/AttrInfo.java
@@ -28,7 +28,6 @@
import java.util.ArrayList;
import java.util.LinkedHashSet;
-import java.util.Set;
import org.opends.server.types.AttributeValue;
@@ -68,6 +67,8 @@
*/
public AttrInfo()
{
+ this.deleteTime = null;
+ this.lastUpdateTime = null;
this.valuesInfo = new ArrayList<ValueInfo>();
}
@@ -148,11 +149,9 @@
* Change historical information after a delete of a set of values.
*
* @param values values that were deleted
- * @param options options for the values
- * @param CN time when the delete was done
+ * @param CN time when the delete was done
*/
- void delete(LinkedHashSet<AttributeValue> values, Set<String> options,
- ChangeNumber CN)
+ void delete(LinkedHashSet<AttributeValue> values, ChangeNumber CN)
{
for (AttributeValue val : values)
{
diff --git a/opends/src/server/org/opends/server/synchronization/ChangeNumber.java b/opends/src/server/org/opends/server/synchronization/ChangeNumber.java
index f758a12..77e08b7 100644
--- a/opends/src/server/org/opends/server/synchronization/ChangeNumber.java
+++ b/opends/src/server/org/opends/server/synchronization/ChangeNumber.java
@@ -153,7 +153,12 @@
public static int compare(ChangeNumber CN1, ChangeNumber CN2)
{
if (CN1 == null)
- return -1;
+ {
+ if (CN2 == null)
+ return 0;
+ else
+ return -1;
+ }
else if (CN2 == null)
return 1;
else if (CN1.timeStamp < CN2.timeStamp)
diff --git a/opends/src/server/org/opends/server/synchronization/Historical.java b/opends/src/server/org/opends/server/synchronization/Historical.java
index fa0d2a1..834e905 100644
--- a/opends/src/server/org/opends/server/synchronization/Historical.java
+++ b/opends/src/server/org/opends/server/synchronization/Historical.java
@@ -257,8 +257,7 @@
if (modAttr.getValues().isEmpty())
attrInfo.delete(changeNumber);
else
- attrInfo.delete(modAttr.getValues(), modAttr.getOptions(),
- changeNumber);
+ attrInfo.delete(modAttr.getValues(), changeNumber);
break;
case ADD:
diff --git a/opends/src/server/org/opends/server/synchronization/ValueInfo.java b/opends/src/server/org/opends/server/synchronization/ValueInfo.java
index 3ebd7c9..245f044 100644
--- a/opends/src/server/org/opends/server/synchronization/ValueInfo.java
+++ b/opends/src/server/org/opends/server/synchronization/ValueInfo.java
@@ -62,8 +62,15 @@
@Override
public boolean equals(Object obj)
{
- ValueInfo objVal = (ValueInfo) obj;
- return (value.equals(objVal.value));
+ if (obj instanceof ValueInfo)
+ {
+ ValueInfo objVal = (ValueInfo) obj;
+ return (value.equals(objVal.getValue()));
+ }
+ else
+ {
+ return false;
+ }
}
/**
--
Gitblit v1.10.0