svn commit: r1389656 - in /zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java

[he...@apache.org]

Author: henry
Date: Mon Sep 24 23:57:20 2012
New Revision: 1389656

URL: http://svn.apache.org/viewvc?rev=1389656&view=rev
Log:
ZOOKEEPER-1238. Linger time should be -1 for Netty sockets. (Skye W-M via henryr)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1389656&r1=1389655&r2=1389656&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Mon Sep 24 23:57:20 2012
@@ -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 - 
 

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java?rev=1389656&r1=1389655&r2=1389656&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java Mon Sep 24 23:57:20 2012
@@ -249,7 +249,8 @@ public class NettyServerCnxnFactory exte
         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);
     }