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 2008/08/25 01:23:39 UTC

svn commit: r688578 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java

Author: akarasulu
Date: Sun Aug 24 16:23:39 2008
New Revision: 688578

URL: http://svn.apache.org/viewvc?rev=688578&view=rev
Log:
race conditions can naturally occur where a null LDAP session is handed off due to something else removing the ldap session before we cleanup

Modified:
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java?rev=688578&r1=688577&r2=688578&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java Sun Aug 24 16:23:39 2008
@@ -104,6 +104,12 @@
      */
     private void cleanUpSession( LdapSession ldapSession )
     {
+        if ( ldapSession == null )
+        {
+            LOG.warn( "Null LdapSession given to cleanUpSession." );
+            return;
+        }
+        
         if ( ldapSession != null )
         {
             ldapSession.abandonAllOutstandingRequests();