You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2018/08/19 21:58:19 UTC

[directory-server] 02/03: Use a Dn method to see if an entry is a descendant, instead of checking using the Rdn index

This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git

commit 8ba2d054c1f963c41c445e8bb7177ccc75afaf03
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Sun Aug 19 23:56:44 2018 +0200

    Use a Dn method to see if an entry is a descendant, instead of checking using the Rdn index
---
 .../directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java b/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java
index 3ef79d3..8f3a0c2 100644
--- a/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java
+++ b/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java
@@ -158,7 +158,7 @@ public class SubtreeScopeEvaluator implements Evaluator<ScopeNode>
          * to all it's subordinates since that would be the entire set of 
          * entries in the db.
          */
-        boolean isDescendant = baseIsContextEntry || baseId.equals( id ) || isDescendant( partitionTxn, id );
+        boolean isDescendant = baseIsContextEntry || baseId.equals( id ) || entry.getDn().isDescendantOf( node.getBaseDn() );
 
         /*
          * The candidate id could be any entry in the db.  If search