directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1040612 - /directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Date Tue, 30 Nov 2010 16:22:18 GMT
Author: elecharny
Date: Tue Nov 30 16:22:17 2010
New Revision: 1040612

URL: http://svn.apache.org/viewvc?rev=1040612&view=rev
Log:
Don't wait indefinitively on standard operations. Uses the default timeout instead.

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

Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1040612&r1=1040611&r2=1040612&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
(original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Tue Nov 30 16:22:17 2010
@@ -789,7 +789,7 @@ public class LdapNetworkConnection exten
         WriteFuture writeFuture = ldapSession.write( addRequest );
 
         // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( getTimeout( 0 ) ) )
+        if ( !writeFuture.awaitUninterruptibly( timeout ) )
         {
             // We didn't received anything : this is an error
             LOG.error( "Add failed : timeout occured" );
@@ -1467,7 +1467,7 @@ public class LdapNetworkConnection exten
         WriteFuture writeFuture = ldapSession.write( searchRequest );
 
         // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( getTimeout( 0 ) ) )
+        if ( !writeFuture.awaitUninterruptibly( timeout ) )
         {
             // We didn't received anything : this is an error
             LOG.error( "Search failed : timeout occured" );
@@ -2131,7 +2131,7 @@ public class LdapNetworkConnection exten
         WriteFuture writeFuture = ldapSession.write( modRequest );
 
         // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( getTimeout( 0 ) ) )
+        if ( !writeFuture.awaitUninterruptibly( timeout ) )
         {
             // We didn't received anything : this is an error
             LOG.error( "Modify failed : timeout occured" );
@@ -2441,7 +2441,7 @@ public class LdapNetworkConnection exten
         WriteFuture writeFuture = ldapSession.write( modDnRequest );
 
         // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( getTimeout( 0 ) ) )
+        if ( !writeFuture.awaitUninterruptibly( timeout ) )
         {
             // We didn't received anything : this is an error
             LOG.error( "Modify failed : timeout occured" );
@@ -2636,7 +2636,7 @@ public class LdapNetworkConnection exten
         WriteFuture writeFuture = ldapSession.write( deleteRequest );
 
         // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( getTimeout( 0 ) ) )
+        if ( !writeFuture.awaitUninterruptibly( timeout ) )
         {
             // We didn't received anything : this is an error
             LOG.error( "Delete failed : timeout occured" );
@@ -2822,7 +2822,7 @@ public class LdapNetworkConnection exten
         WriteFuture writeFuture = ldapSession.write( compareRequest );
 
         // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( getTimeout( 0 ) ) )
+        if ( !writeFuture.awaitUninterruptibly( timeout ) )
         {
             // We didn't received anything : this is an error
             LOG.error( "Compare failed : timeout occured" );
@@ -2980,7 +2980,7 @@ public class LdapNetworkConnection exten
         WriteFuture writeFuture = ldapSession.write( extendedRequest );
 
         // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( getTimeout( 0 ) ) )
+        if ( !writeFuture.awaitUninterruptibly( timeout ) )
         {
             // We didn't received anything : this is an error
             LOG.error( "Extended failed : timeout occured" );
@@ -3655,7 +3655,7 @@ public class LdapNetworkConnection exten
         WriteFuture writeFuture = ldapSession.write( bindRequest );
 
         // Wait for the message to be sent to the server
-        if ( !writeFuture.awaitUninterruptibly( getTimeout( 0 ) ) )
+        if ( !writeFuture.awaitUninterruptibly( timeout ) )
         {
             // We didn't received anything : this is an error
             LOG.error( "Bind failed : timeout occured" );



Mime
View raw message