From 16bdb19cdda5201d272cd6ca5bf876c88493327c Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Mon, 14 Sep 2015 09:32:51 +0000
Subject: [PATCH] OPENDJ-1654 LDAPOptions should be converted in a SchemaOptions style API
---
opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyUtils.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyUtils.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyUtils.java
index 6b37b0f..5b4012a 100644
--- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyUtils.java
+++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyUtils.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2013 ForgeRock AS.
+ * Copyright 2013-2015 ForgeRock AS.
*/
package org.forgerock.opendj.grizzly;
@@ -34,6 +34,7 @@
import org.forgerock.opendj.io.LDAPReader;
import org.forgerock.opendj.io.LDAPWriter;
import org.forgerock.opendj.ldap.DecodeOptions;
+import org.forgerock.util.Options;
import org.glassfish.grizzly.Connection;
import org.glassfish.grizzly.Processor;
import org.glassfish.grizzly.ThreadCache;
@@ -45,6 +46,8 @@
import org.glassfish.grizzly.nio.transport.TCPNIOConnection;
import org.glassfish.grizzly.ssl.SSLFilter;
+import static org.forgerock.opendj.ldap.LDAPConnectionFactory.*;
+
/**
* Common utility methods.
*/
@@ -184,9 +187,7 @@
ThreadCache.putToCache(WRITER_INDEX, writer);
}
- static void configureConnection(final Connection<?> connection, final boolean tcpNoDelay,
- final boolean keepAlive, final boolean reuseAddress, final int linger,
- final LocalizedLogger logger) {
+ static void configureConnection(final Connection<?> connection, final LocalizedLogger logger, Options options) {
/*
* Test shows that its much faster with non block writes but risk
* running out of memory if the server is slow.
@@ -196,6 +197,10 @@
// Configure socket options.
final SocketChannel channel = (SocketChannel) ((TCPNIOConnection) connection).getChannel();
final Socket socket = channel.socket();
+ final boolean tcpNoDelay = options.get(TCP_NO_DELAY);
+ final boolean keepAlive = options.get(KEEPALIVE);
+ final boolean reuseAddress = options.get(REUSE_ADDRESS);
+ final int linger = options.get(LINGER);
try {
socket.setTcpNoDelay(tcpNoDelay);
} catch (final SocketException e) {
--
Gitblit v1.10.0