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 2007/09/19 19:04:20 UTC
svn commit: r577378 -
/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
Author: elecharny
Date: Wed Sep 19 10:04:20 2007
New Revision: 577378
URL: http://svn.apache.org/viewvc?rev=577378&view=rev
Log:
Minor code cleaning (adding some NL)
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java?rev=577378&r1=577377&r2=577378&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java Wed Sep 19 10:04:20 2007
@@ -63,10 +63,13 @@
case ( SearchControls.OBJECT_SCOPE ):
String dn = db.getEntryDn( (Long)record.getEntryId() );
return dn.equals( snode.getBaseDn() );
+
case ( SearchControls.ONELEVEL_SCOPE ):
return assertOneLevelScope( snode, (Long)record.getEntryId() );
+
case ( SearchControls.SUBTREE_SCOPE ):
return assertSubtreeScope( snode, (Long)record.getEntryId() );
+
default:
throw new NamingException( "Unrecognized search scope!" );
}
@@ -106,6 +109,7 @@
* not be returned.
*/
Index idx = db.getAliasIndex();
+
if ( null != idx.reverseLookup( id ) )
{
return false;
@@ -134,6 +138,7 @@
* candidate is rejected with a false return because it is not in scope.
*/
idx = db.getSubAliasIndex();
+
return idx.hasValue( baseId, id );
}
@@ -171,6 +176,7 @@
* not be returned.
*/
idx = db.getAliasIndex();
+
if ( null != idx.reverseLookup( id ) )
{
return false;
@@ -196,6 +202,7 @@
* candidate is rejected with a false return because it is not in scope.
*/
idx = db.getOneAliasIndex();
+
return idx.hasValue( baseId, id );
}
}