From f4cd3f1d932329eeb44249461d213a1852ab8b5f Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 28 Feb 2014 08:53:40 +0000
Subject: [PATCH] Additional fix for OPENDJ-1197: API is lacking functionality to specify TCP connect timeout
---
opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyUtils.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyUtils.java b/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyUtils.java
index b9002d0..4ded303 100644
--- a/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyUtils.java
+++ b/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/GrizzlyUtils.java
@@ -27,9 +27,8 @@
import static com.forgerock.opendj.util.StaticUtils.DEBUG_LOG;
-import java.io.IOException;
-import java.net.SocketOption;
-import java.net.StandardSocketOptions;
+import java.net.Socket;
+import java.net.SocketException;
import java.nio.channels.SocketChannel;
import java.util.logging.Level;
@@ -50,18 +49,33 @@
// Configure socket options.
final SocketChannel channel = (SocketChannel) ((TCPNIOConnection) connection).getChannel();
- setSocketOption(channel, StandardSocketOptions.TCP_NODELAY, tcpNoDelay);
- setSocketOption(channel, StandardSocketOptions.SO_KEEPALIVE, keepAlive);
- setSocketOption(channel, StandardSocketOptions.SO_REUSEADDR, reuseAddress);
- setSocketOption(channel, StandardSocketOptions.SO_LINGER, linger);
- }
-
- private static <T> void setSocketOption(final SocketChannel channel,
- final SocketOption<T> option, final T value) {
+ final Socket socket = channel.socket();
try {
- channel.setOption(option, value);
- } catch (final IOException e) {
- DEBUG_LOG.log(Level.FINE, "Unable to set " + option.name() + " to " + value
+ socket.setTcpNoDelay(tcpNoDelay);
+ } catch (final SocketException e) {
+ DEBUG_LOG.log(Level.FINE, "Unable to set TCP_NODELAY to " + tcpNoDelay
+ + " on client connection", e);
+ }
+ try {
+ socket.setKeepAlive(keepAlive);
+ } catch (final SocketException e) {
+ DEBUG_LOG.log(Level.FINE, "Unable to set SO_KEEPALIVE to " + keepAlive
+ + " on client connection", e);
+ }
+ try {
+ socket.setReuseAddress(reuseAddress);
+ } catch (final SocketException e) {
+ DEBUG_LOG.log(Level.FINE, "Unable to set SO_REUSEADDR to " + reuseAddress
+ + " on client connection", e);
+ }
+ try {
+ if (linger < 0) {
+ socket.setSoLinger(false, 0);
+ } else {
+ socket.setSoLinger(true, linger);
+ }
+ } catch (final SocketException e) {
+ DEBUG_LOG.log(Level.FINE, "Unable to set SO_LINGER to " + linger
+ " on client connection", e);
}
}
--
Gitblit v1.10.0