directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1071574 - /directory/shared/branches/m1/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Date Thu, 17 Feb 2011 11:15:27 GMT
Author: pamarcelot
Date: Thu Feb 17 11:15:27 2011
New Revision: 1071574

URL: http://svn.apache.org/viewvc?rev=1071574&view=rev
Log:
Fix for DIRAPI-43 (LDAP API internally sends an abandon request when something goes wrong
in a bind request which is not allowed by RFC 4511).

Modified:
    directory/shared/branches/m1/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java

Modified: directory/shared/branches/m1/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1071574&r1=1071573&r2=1071574&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
(original)
+++ directory/shared/branches/m1/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Thu Feb 17 11:15:27 2011
@@ -1005,12 +1005,6 @@ public class LdapNetworkConnection exten
         }
         catch ( TimeoutException te )
         {
-            // Send an abandon request
-            if ( !bindFuture.isCancelled() )
-            {
-                abandon( bindRequest.getMessageId() );
-            }
-
             // We didn't received anything : this is an error
             LOG.error( "Bind failed : timeout occured" );
             throw new LdapException( TIME_OUT_ERROR );
@@ -1021,13 +1015,6 @@ public class LdapNetworkConnection exten
             LOG.error( NO_RESPONSE_ERROR, ie );
             LdapException ldapException = new LdapException( NO_RESPONSE_ERROR );
             ldapException.initCause( ie );
-
-            // Send an abandon request
-            if ( !bindFuture.isCancelled() )
-            {
-                abandon( bindRequest.getMessageId() );
-            }
-
             throw ldapException;
         }
     }



Mime
View raw message