From cd5eaba5f1f6167f75eab16c634bd667a9855eec Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 26 Jun 2013 12:31:05 +0000
Subject: [PATCH] Minor code & comment cleanup in MemberOf Virtual Attribute Provider.
---
opends/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java b/opends/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
index 3558603..08fe7fd 100644
--- a/opends/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
+++ b/opends/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProvider.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -195,14 +195,7 @@
{
DN groupDN = DN.decode(value.getValue());
Group<?> g = DirectoryServer.getGroupManager().getGroupInstance(groupDN);
- if (g == null)
- {
- return false;
- }
- else
- {
- return g.isMember(entry);
- }
+ return g != null && g.isMember(entry);
}
catch (Exception e)
{
@@ -312,12 +305,8 @@
SearchOperation searchOperation,
boolean isPreIndexed)
{
- if (isPreIndexed)
- {
- return false;
- }
- return isSearchable(rule.getAttributeType(), searchOperation.getFilter(),
- 0);
+ return !isPreIndexed &&
+ isSearchable(rule.getAttributeType(), searchOperation.getFilter(), 0);
}
@@ -329,7 +318,7 @@
* to make the determination.
*
* @param attributeType The attribute type used to hold the entryDN value.
- * @param searchFilter The search filter for which to make the
+ * @param filter The search filter for which to make the
* determination.
* @param depth The current recursion depth for this processing.
*
--
Gitblit v1.10.0