From 6c4fd8bb6478077a9fd7b92c9cb7fdf9d6c42f8a Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Fri, 09 Feb 2007 20:33:01 +0000
Subject: [PATCH] Minor synchronization code changes:
---
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/Historical.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/Historical.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/Historical.java
index 1831ef3..df26d97 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/Historical.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/Historical.java
@@ -34,6 +34,7 @@
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
+import java.util.HashSet;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
@@ -141,10 +142,6 @@
Modification m = (Modification) modsIterator.next();
Attribute modAttr = m.getAttribute();
Set<String> options = modAttr.getOptions();
- if (options.isEmpty())
- {
- options = null;
- }
AttributeType type = modAttr.getAttributeType();
AttrInfoWithOptions attrInfoWithOptions = attributesInfo.get(type);
AttrInfo attrInfo = null;
@@ -263,10 +260,6 @@
return;
}
Set<String> options = modAttr.getOptions();
- if (options.isEmpty())
- {
- options = null;
- }
AttributeType type = modAttr.getAttributeType();
AttrInfoWithOptions attrInfoWithOptions = attributesInfo.get(type);
AttrInfo attrInfo;
@@ -477,7 +470,7 @@
*/
private boolean hasConflict(AttrInfo info, ChangeNumber newChange)
{
- // if I've already seen a change that is more recetn than the one
+ // if I've already seen a change that is more recent than the one
// that is currently being processed, then there is
// a potential conflict
if (ChangeNumber.compare(newChange, moreRecentChangenumber) <= 0)
@@ -758,7 +751,7 @@
List<Attribute> hist = entry.getAttribute(historicalAttrType);
Historical histObj = new Historical();
AttributeType lastAttrType = null;
- Set<String> lastOptions = null;
+ Set<String> lastOptions = new HashSet<String>();
AttrInfo attrInfo = null;
AttrInfoWithOptions attrInfoWithOptions = null;
--
Gitblit v1.10.0