From e76beb449ee2a27ab048ec81dc6811981d01d1a2 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 29 Jun 2011 21:35:41 +0000
Subject: [PATCH] Fix unit test broken in fix for OPENDJ-216.
---
opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationBasis.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationBasis.java b/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationBasis.java
index c266177..4f708f8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationBasis.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/SearchOperationBasis.java
@@ -95,6 +95,7 @@
// Indicates whether the filter references subentry or ldapSubentry object
// class.
private boolean filterIncludesSubentries;
+ private boolean filterNeedsCheckingForSubentries = true;
// Indicates whether to include attribute types only or both types and values.
private boolean typesOnly;
@@ -521,7 +522,6 @@
if (filter == null)
{
filter = rawFilter.toSearchFilter();
- filterIncludesSubentries = checkFilterForLDAPSubEntry(filter, 0);
}
}
catch (DirectoryException de)
@@ -617,6 +617,12 @@
// should be returned.
if (entry.isSubentry() || entry.isLDAPSubentry())
{
+ if (filterNeedsCheckingForSubentries == true)
+ {
+ filterIncludesSubentries = checkFilterForLDAPSubEntry(filter, 0);
+ filterNeedsCheckingForSubentries = false;
+ }
+
if ((getScope() != SearchScope.BASE_OBJECT)
&& !filterIncludesSubentries
&& !isReturnSubentriesOnly())
--
Gitblit v1.10.0