From 6912362c6715306768c8fc14dd18ad9293e4c2ca Mon Sep 17 00:00:00 2001
From: abobrov <abobrov@localhost>
Date: Fri, 25 Dec 2009 18:28:32 +0000
Subject: [PATCH] - land Subentry Manager and Collective Attributes implementations; Merry XMAS to yall!
---
opends/src/server/org/opends/server/core/SearchOperationBasis.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/SearchOperationBasis.java b/opends/src/server/org/opends/server/core/SearchOperationBasis.java
index 5a8d35f..d1d2ba1 100644
--- a/opends/src/server/org/opends/server/core/SearchOperationBasis.java
+++ b/opends/src/server/org/opends/server/core/SearchOperationBasis.java
@@ -609,7 +609,7 @@
// Determine whether the provided entry is a subentry and if so whether it
// should be returned.
- if (entry.isLDAPSubentry())
+ if (entry.isSubentry() || entry.isLDAPSubentry())
{
if ((getScope() != SearchScope.BASE_OBJECT) &&
(! isReturnLDAPSubentries()))
@@ -1494,7 +1494,11 @@
if (filter.getAttributeType().isObjectClassType())
{
AttributeValue v = filter.getAssertionValue();
- if (toLowerCase(v.getValue().toString()).equals("ldapsubentry"))
+ // FIXME : technically this is not correct since the presense
+ // of draft oc would trigger rfc oc visibility and visa versa.
+ String stringValueLC = toLowerCase(v.getValue().toString());
+ if (stringValueLC.equals(OC_LDAP_SUBENTRY_LC) ||
+ stringValueLC.equals(OC_SUBENTRY))
{
setReturnLDAPSubentries(true);
}
--
Gitblit v1.10.0