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/07 11:22:49 UTC
svn commit: r1381942 -
/directory/apacheds/branches/apacheds-mvbt/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
Author: elecharny
Date: Fri Sep 7 09:22:49 2012
New Revision: 1381942
URL: http://svn.apache.org/viewvc?rev=1381942&view=rev
Log:
Minor refactoring
Modified:
directory/apacheds/branches/apacheds-mvbt/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
Modified: directory/apacheds/branches/apacheds-mvbt/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1381942&r1=1381941&r2=1381942&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Fri Sep 7 09:22:49 2012
@@ -244,25 +244,26 @@ public class SearchHandler extends LdapR
{
Map<String, Control> controlMap = req.getControls();
Control[] controls = null;
-
+
if ( controlMap != null )
{
Collection<Control> controlValues = controlMap.values();
-
+
controls = new Control[controlValues.size()];
int pos = 0;
-
+
for ( Control control : controlMap.values() )
{
controls[pos++] = control;
}
}
-
+
Entry entry = session.getCoreSession().lookup(
req.getBase(),
controls,
- req.getAttributes().toArray( new String[]{} ) );
-
+ req.getAttributes().toArray( new String[]
+ {} ) );
+
session.getIoSession().write( generateResponse( session, req, entry ) );
// write the SearchResultDone message
@@ -976,8 +977,8 @@ public class SearchHandler extends LdapR
// using varags to add two expressions to an OR node
req.setFilter( new OrNode( req.getFilter(), newIsReferralEqualityNode( session ) ) );
}
-
-
+
+
/**
* Handles the RootDSE and lookups searches
*/
@@ -1003,20 +1004,20 @@ public class SearchHandler extends LdapR
}
}
-/*
- if ( isBaseScope && isObjectClassFilter )
- {
- // This is a lookup
- handleLookup( session, req );
+ /*
+ if ( isBaseScope && isObjectClassFilter )
+ {
+ // This is a lookup
+ handleLookup( session, req );
- return true;
- }
- else
- {
- // a standard search
- return false;
- }
-*/
+ return true;
+ }
+ else
+ {
+ // a standard search
+ return false;
+ }
+ */
boolean isBaseIsRoot = req.getBase().isEmpty();
if ( isBaseScope && isObjectClassFilter )
@@ -1080,7 +1081,6 @@ public class SearchHandler extends LdapR
{
return;
}
-
// modify the filter to affect continuation support
modifyFilter( session, req );