From 7980319905f6d043550827fd896317eaa39f7009 Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Fri, 18 Aug 2006 20:41:09 +0000
Subject: [PATCH] Fix for issue 592 -- delete of one subtype value deletes all values of the attribute.
---
opendj-sdk/opends/src/server/org/opends/server/types/Entry.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java b/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
index 4a34089..6d65386 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
+++ b/opendj-sdk/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;
--
Gitblit v1.10.0