From ed08a89377a333c10202ead88d355e16bcb3a0fd Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 27 Feb 2014 23:31:10 +0000
Subject: [PATCH] Backport fix for OPENDJ-1197: API is lacking functionality to specify TCP connect timeout
---
opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java b/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java
index ed4bd3f..1c16c06 100644
--- a/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java
+++ b/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java
@@ -87,7 +87,8 @@
/**
* LDAP connection implementation.
*/
-final class LDAPConnection extends AbstractAsynchronousConnection implements Connection {
+final class LDAPConnection extends AbstractAsynchronousConnection implements Connection,
+ TimeoutEventListener {
/**
* A dummy SSL client engine configurator as SSLFilter only needs client
* config. This prevents Grizzly from needlessly using JVM defaults which
@@ -385,6 +386,11 @@
}
@Override
+ public long getTimeout() {
+ return factory.getLDAPOptions().getTimeout(TimeUnit.MILLISECONDS);
+ }
+
+ @Override
public <R extends ExtendedResult> FutureResult<R> extendedRequestAsync(
final ExtendedRequest<R> request,
final IntermediateResponseHandler intermediateResponseHandler,
@@ -568,7 +574,8 @@
return builder.toString();
}
- long cancelExpiredRequests(final long currentTime) {
+ @Override
+ public long handleTimeout(final long currentTime) {
final long timeout = factory.getLDAPOptions().getTimeout(TimeUnit.MILLISECONDS);
if (timeout <= 0) {
return 0;
@@ -701,7 +708,7 @@
} finally {
asn1Writer.recycle();
}
- factory.getTimeoutChecker().removeConnection(this);
+ factory.getTimeoutChecker().removeListener(this);
connection.closeSilently();
factory.releaseTransportAndTimeoutChecker();
}
--
Gitblit v1.10.0