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 2012/09/14 21:32:28 UTC
svn commit: r1384897 - in
/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search:
PartitionSearchResult.java impl/CursorBuilder.java
Author: elecharny
Date: Fri Sep 14 19:32:27 2012
New Revision: 1384897
URL: http://svn.apache.org/viewvc?rev=1384897&view=rev
Log:
o Removed the useless AliasId list from the PartitionSearchResult class
o Renomed a method
Modified:
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/PartitionSearchResult.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/PartitionSearchResult.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/PartitionSearchResult.java?rev=1384897&r1=1384896&r2=1384897&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/PartitionSearchResult.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/PartitionSearchResult.java Fri Sep 14 19:32:27 2012
@@ -20,8 +20,6 @@
package org.apache.directory.server.xdbm.search;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Set;
import org.apache.directory.server.xdbm.IndexEntry;
@@ -52,9 +50,6 @@ public class PartitionSearchResult
/** The flag indicating if we are dereferencing the aliases. Default to Never. */
private AliasDerefMode aliasDerefMode = AliasDerefMode.NEVER_DEREF_ALIASES;
- /** The list of aliased entries that still have to be dereferenced */
- private List<String> aliasedIds;
-
/** The evaluator to validate the candidates */
private Evaluator<? extends ExprNode> evaluator;
@@ -126,34 +121,11 @@ public class PartitionSearchResult
/**
- * @return the aliasedIds
- */
- public List<String> getAliasedIds()
- {
- return aliasedIds;
- }
-
-
- /**
- * @param aliasedIds the aliasedIds to set
- */
- public void setAliasedIds( List<String> aliasedIds )
- {
- this.aliasedIds = aliasedIds;
- }
-
-
- /**
* @param aliasDerefMode the aliasDerefMode to set
*/
public void setAliasDerefMode( AliasDerefMode aliasDerefMode )
{
this.aliasDerefMode = aliasDerefMode;
-
- if ( !isNeverDeref() )
- {
- aliasedIds = new ArrayList<String>();
- }
}
@@ -169,7 +141,7 @@ public class PartitionSearchResult
/**
* @return True if the alias is always dereferenced
*/
- public boolean isAlwaysDeref()
+ public boolean isDerefAlways()
{
return aliasDerefMode == AliasDerefMode.DEREF_ALWAYS;
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java?rev=1384897&r1=1384896&r2=1384897&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java Fri Sep 14 19:32:27 2012
@@ -414,7 +414,7 @@ public class CursorBuilder
// If the entry is an alias, and we asked for it to be dereferenced,
// we will dereference the alias
- if ( searchResult.isAlwaysDeref() || searchResult.isDerefInSearching() )
+ if ( searchResult.isDerefAlways() || searchResult.isDerefInSearching() )
{
String aliasedDn = db.getAliasIndex().reverseLookup( uuid );
@@ -501,7 +501,7 @@ public class CursorBuilder
// If the entry is an alias, and we asked for it to be dereferenced,
// we will dereference the alias
- if ( searchResult.isAlwaysDeref() || searchResult.isDerefInSearching() )
+ if ( searchResult.isDerefAlways() || searchResult.isDerefInSearching() )
{
String aliasedDn = db.getAliasIndex().reverseLookup( uuid );