Fix unit test broken in fix for OPENDJ-216.

Matthew Swift

29.35.2011 b8cb6b0aee9f4a51de85e9ef297078b0899717f2

Fix unit test broken in fix for OPENDJ-216.

 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())