Commit 754a4c3c authored by Flavio Paiva Junqueira's avatar Flavio Paiva Junqueira
Browse files

ZOOKEEPER-1238. when the linger time was changed for NIO the patch missed

Netty (Skye Wanderman-Milne via fpj)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/branches/branch-3.4@1557614 13f79535-47bb-0310-9956-ffa450edef68
parent 399d71d6
......@@ -221,6 +221,9 @@ BUGFIXES:
ZOOKEEPER-1857. PrepRequestProcessotTest doesn't shutdown ZooKeeper server
(Germán Blanco via michim)
ZOOKEEPER-1238. when the linger time was changed for NIO the patch missed
Netty (Skye Wanderman-Milne via fpj)
IMPROVEMENTS:
ZOOKEEPER-1564. Allow JUnit test build with IBM Java
......
......@@ -249,7 +249,8 @@ public class NettyServerCnxnFactory extends ServerCnxnFactory {
bootstrap.setOption("reuseAddress", true);
// child channels
bootstrap.setOption("child.tcpNoDelay", true);
bootstrap.setOption("child.soLinger", 2);
/* set socket linger to off, so that socket close does not block */
bootstrap.setOption("child.soLinger", -1);
bootstrap.getPipeline().addLast("servercnxnfactory", channelHandler);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment