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 2008/12/03 21:08:18 UTC
svn commit: r723051 - in
/directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap:
LdapProtocolHandler.java handlers/AddHandler.java handlers/BindHandler.java
handlers/LdapRequestHandler.java
Author: elecharny
Date: Wed Dec 3 12:08:18 2008
New Revision: 723051
URL: http://svn.apache.org/viewvc?rev=723051&view=rev
Log:
Replaced tabs by 4 spaces.
Modified:
directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java
directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
Modified: directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java?rev=723051&r1=723050&r2=723051&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java (original)
+++ directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java Wed Dec 3 12:08:18 2008
@@ -129,9 +129,9 @@
*/
public void messageSent( IoSession session, Object message ) throws Exception
{
- // Do nothing : we have to ignore this message, otherwise we get an exception,
- // thanks to the way MINA 2 works ...
- }
+ // Do nothing : we have to ignore this message, otherwise we get an exception,
+ // thanks to the way MINA 2 works ...
+ }
/*
Modified: directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java?rev=723051&r1=723050&r2=723051&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java (original)
+++ directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java Wed Dec 3 12:08:18 2008
@@ -38,7 +38,7 @@
*/
public class AddHandler extends LdapRequestHandler<AddRequest>
{
- /** The logger for this class */
+ /** The logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( AddHandler.class );
@@ -52,7 +52,7 @@
try
{
- // Call the underlying layer to inject the new entry
+ // Call the underlying layer to inject the new entry
CoreSession coreSession = session.getCoreSession();
coreSession.add( req );
Modified: directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java?rev=723051&r1=723050&r2=723051&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java (original)
+++ directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java Wed Dec 3 12:08:18 2008
@@ -169,22 +169,22 @@
// opContext.setEntry( principalEntry );
// And call the OperationManager bind operation.
- getLdapServer().getDirectoryService().getOperationManager().bind( opContext );
-
- // As a result, store the created session in the Core Session
- ldapSession.setCoreSession( opContext.getSession() );
-
- if ( ! ldapSession.getCoreSession().isAnonymous() )
- {
- ldapSession.setAuthenticated();
- }
-
- // Return the successful response
- sendBindSuccess( ldapSession, bindRequest, null );
+ getLdapServer().getDirectoryService().getOperationManager().bind( opContext );
+
+ // As a result, store the created session in the Core Session
+ ldapSession.setCoreSession( opContext.getSession() );
+
+ if ( ! ldapSession.getCoreSession().isAnonymous() )
+ {
+ ldapSession.setAuthenticated();
+ }
+
+ // Return the successful response
+ sendBindSuccess( ldapSession, bindRequest, null );
}
catch ( Exception e )
{
- // Something went wrong. Write back an error message
+ // Something went wrong. Write back an error message
ResultCodeEnum code = null;
LdapResult result = bindRequest.getResultResponse().getLdapResult();
@@ -211,7 +211,7 @@
if ( e instanceof LdapAuthenticationException )
{
- name = ( ( LdapAuthenticationException ) e ).getResolvedName();
+ name = ( ( LdapAuthenticationException ) e ).getResolvedName();
}
if ( ( name != null )
Modified: directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java?rev=723051&r1=723050&r2=723051&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java (original)
+++ directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java Wed Dec 3 12:08:18 2008
@@ -159,7 +159,7 @@
// only if it's not a BindRequest
if ( message instanceof BindRequest )
{
- handle( ldapSession, message );
+ handle( ldapSession, message );
}
else
{