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/HistVal.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistVal.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistVal.java
index ed4c600..579f025 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistVal.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistVal.java
@@ -26,7 +26,6 @@
  */
 package org.opends.server.synchronization.plugin;
 
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -40,7 +39,7 @@
 
 
 /**
- * This Class is used to encode/decode hsitorical information
+ * This Class is used to encode/decode historical information
  * from the String form to the internal usable form.
  *
  * @author Gilles Bellaton
@@ -51,7 +50,7 @@
   private String attrString;
   private AttributeValue attributeValue;
   private ChangeNumber cn;
-  private Set<String> options = null;
+  private LinkedHashSet<String> options;
   private HistKey histKey;
   private String stringValue;
 
@@ -84,10 +83,10 @@
      */
     String[] token = strVal.split(":", 4);
 
+    options = new LinkedHashSet<String>();
     if (token[0].contains(";"))
     {
       String[] optionsToken = token[0].split(";");
-      options = new HashSet<String>();
       int index = 1;
       while (index < optionsToken.length)
       {
@@ -153,7 +152,7 @@
   }
 
   /**
-   * Get the options.
+   * Get the options or an empty set if there are no options.
    * @return Returns the options.
    */
   public Set<String> getOptions()
@@ -186,7 +185,7 @@
    */
   public Modification generateMod()
   {
-    Attribute attr = new Attribute(attrType);
+    Attribute attr = new Attribute(attrType, attrString, options, null);
     Modification mod;
     if (histKey != HistKey.DELATTR)
     {

--
Gitblit v1.10.0