zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f..@apache.org
Subject svn commit: r1557614 - in /zookeeper/branches/branch-3.4: CHANGES.txt src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java
Date Sun, 12 Jan 2014 21:36:18 GMT
Author: fpj
Date: Sun Jan 12 21:36:17 2014
New Revision: 1557614

URL: http://svn.apache.org/r1557614
Log:
ZOOKEEPER-1238. when the linger time was changed for NIO the patch missed 
Netty (Skye Wanderman-Milne via fpj)

Modified:
    zookeeper/branches/branch-3.4/CHANGES.txt
    zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1557614&r1=1557613&r2=1557614&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Sun Jan 12 21:36:17 2014
@@ -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

Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java?rev=1557614&r1=1557613&r2=1557614&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java
(original)
+++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java
Sun Jan 12 21:36:17 2014
@@ -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);
     }



Mime
View raw message