You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/02/07 02:39:00 UTC
svn commit: r1067838 -
/directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
Author: akarasulu
Date: Mon Feb 7 01:39:00 2011
New Revision: 1067838
URL: http://svn.apache.org/viewvc?rev=1067838&view=rev
Log:
cleaning up
Modified:
directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
Modified: directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java?rev=1067838&r1=1067837&r2=1067838&view=diff
==============================================================================
--- directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java (original)
+++ directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java Mon Feb 7 01:39:00 2011
@@ -65,7 +65,7 @@ class LdapProtocolHandler extends Demuxi
/**
* Creates a new instance of LdapProtocolHandler.
*
- * @param ldapServer
+ * @param ldapServer The LDAP server instance
*/
LdapProtocolHandler( LdapServer ldapServer )
{
@@ -105,12 +105,7 @@ class LdapProtocolHandler extends Demuxi
}
catch ( Exception e )
{
- if ( Strings.isEmpty(id) )
- {
- return false;
- }
-
- return id.endsWith( ";binary" );
+ return !Strings.isEmpty(id) && id.endsWith(";binary");
}
}
} );
@@ -151,11 +146,8 @@ class LdapProtocolHandler extends Demuxi
LOG.debug( "Cleaning the {} session", ldapSession );
- if ( ldapSession != null )
- {
- // Abandon all the requests
- ldapSession.abandonAllOutstandingRequests();
- }
+ // Abandon all the requests
+ ldapSession.abandonAllOutstandingRequests();
if ( !ldapSession.getIoSession().isClosing() || ldapSession.getIoSession().isConnected() )
{