Fix for issue 592 -- delete of one subtype value deletes all values of the ...

coulbeck

18.41.2006 2e1214334d97569705007fc412d89e6859b85e2b

Fix for issue 592 -- delete of one subtype value deletes all values of the attribute.

 opends/src/server/org/opends/server/types/Entry.java

@@ -1582,14 +1582,14 @@

    if (attribute.hasOptions())
    {
      HashSet<String> options = attribute.getOptions();

      LinkedHashSet<AttributeValue> valueSet = attribute.getValues();
      if ((valueSet == null) || valueSet.isEmpty())
      {
        return removeAttribute(attribute.getAttributeType());
        return removeAttribute(attribute.getAttributeType(), options);
      }

      HashSet<String> options = attribute.getOptions();

      List<Attribute> attrList =
           getAttribute(attribute.getAttributeType());
      if (attrList == null)
@@ -1614,7 +1614,8 @@

          if (existingValueSet.isEmpty())
          {
            return removeAttribute(attribute.getAttributeType());
            return removeAttribute(attribute.getAttributeType(),
                                   options);
          }

          return true;