From cd57b969289f568da79e41fffe451aa0ed837722 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 28 Jan 2009 23:43:17 +0000
Subject: [PATCH] Fix issue 3446 and improve fix for issue 3726:
---
opends/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java b/opends/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
index 30d024a..130b741 100644
--- a/opends/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
+++ b/opends/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProvider.java
@@ -22,14 +22,15 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2009 Sun Microsystems, Inc.
*/
package org.opends.server.extensions;
-import java.util.LinkedHashSet;
+import java.util.Collections;
import java.util.List;
+import java.util.Set;
import org.opends.messages.Message;
import org.opends.server.admin.std.server.HasSubordinatesVirtualAttributeCfg;
@@ -109,11 +110,9 @@
* {@inheritDoc}
*/
@Override()
- public LinkedHashSet<AttributeValue> getValues(Entry entry,
- VirtualAttributeRule rule)
+ public Set<AttributeValue> getValues(Entry entry,
+ VirtualAttributeRule rule)
{
- LinkedHashSet<AttributeValue> values = new LinkedHashSet<AttributeValue>(1);
-
Backend backend = DirectoryServer.getBackend(entry.getDN());
try
@@ -124,7 +123,7 @@
AttributeValue value =
new AttributeValue(ByteStringFactory.create(ret.toString()),
ByteStringFactory.create(ret.toString()));
- values.add(value);
+ return Collections.singleton(value);
}
}
catch(DirectoryException de)
@@ -135,7 +134,7 @@
}
}
- return values;
+ return Collections.emptySet();
}
--
Gitblit v1.10.0