directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r659895 - /directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
Date Sun, 25 May 2008 02:36:16 GMT
Author: akarasulu
Date: Sat May 24 19:36:15 2008
New Revision: 659895

URL: http://svn.apache.org/viewvc?rev=659895&view=rev
Log:
use SearchScope enum instead of SearchControls constants

Modified:
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=659895&r1=659894&r2=659895&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
(original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
Sat May 24 19:36:15 2008
@@ -61,6 +61,7 @@
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
+import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.SubentriesControl;
@@ -257,10 +258,9 @@
     {
         EntryFilteringCursor cursor = nextInterceptor.search( opContext );
         Invocation invocation = InvocationStack.getInstance().peek();
-        SearchControls searchCtls = opContext.getSearchControls();
 
         // object scope searches by default return subentries
-        if ( searchCtls.getSearchScope() == SearchControls.OBJECT_SCOPE )
+        if ( opContext.getScope() == SearchScope.OBJECT )
         {
             return cursor;
         }



Mime
View raw message