From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 7 May 2007 13:44:13 +0000 (+0000)
Subject: Set correct soLinger time
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=adf5525ba676e2025d243a4787ebf6769ae2ce5b;p=tomcat7.0

Set correct soLinger time


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@535877 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/tribes/transport/nio/NioSender.java b/java/org/apache/catalina/tribes/transport/nio/NioSender.java
index 4c1d786cd..0cc20ffe1 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioSender.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioSender.java
@@ -138,7 +138,7 @@ public class NioSender extends AbstractSender implements DataSender{
         socketChannel.socket().setSendBufferSize(getTxBufSize());
         socketChannel.socket().setReceiveBufferSize(getRxBufSize());
         socketChannel.socket().setSoTimeout((int)getTimeout());
-        socketChannel.socket().setSoLinger(getSoLingerOn(),0);
+        socketChannel.socket().setSoLinger(getSoLingerOn(),getSoLingerOn()?getSoLingerTime():0);
         socketChannel.socket().setTcpNoDelay(getTcpNoDelay());
         socketChannel.socket().setKeepAlive(getSoKeepAlive());
         socketChannel.socket().setReuseAddress(getSoReuseAddress());