ZOOKEEPER-1238. Linger time should be -1 for Netty sockets. (Skye W-M…

… via henryr) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1389656 13f79535-47bb-0310-9956-ffa450edef68
dgomezferro · Sep 24, 2012 · 9e906c1 · 9e906c1
1 parent ef8c40b
commit 9e906c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -382,6 +382,8 @@ IMPROVEMENTS:
   to be programmatically set (rather than only by reading JAAS
   configuration file) (Matteo Bertozzi via phunt)
 
+  ZOOKEEPER-1238. Linger time should be -1 for Netty sockets. (Skye
+  W-M via henryr)
 
 Release 3.4.0 - 
 

diff --git a/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java b/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java
@@ -249,7 +249,8 @@ public void writeComplete(ChannelHandlerContext ctx,
         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);
     }