[prev in list] [next in list] [prev in thread] [next in thread]
List: tomcat-dev
Subject: svn commit: r1767305 - in /tomcat/trunk/java/org/apache: coyote/AbstractProtocol.java tomcat/util/ne
From: markt () apache ! org
Date: 2016-10-31 15:24:37
Message-ID: 20161031152438.6A5533A27EE () svn01-us-west ! apache ! org
[Download RAW message or body]
Author: markt
Date: Mon Oct 31 15:24:37 2016
New Revision: 1767305
URL: http://svn.apache.org/viewvc?rev=1767305&view=rev
Log:
Follow up to r1767250: rename soLinger to connectionLinger in ProcotolHandler and \
Endpoint
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1767305&r1=1767304&r2=1767305&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Oct 31 15:24:37 \
2016 @@ -105,7 +105,7 @@ public abstract class AbstractProtocol<S
public AbstractProtocol(AbstractEndpoint<S> endpoint) {
this.endpoint = endpoint;
- setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
+ setConnectionLinger(Constants.DEFAULT_CONNECTION_LINGER);
setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
}
@@ -243,8 +243,10 @@ public abstract class AbstractProtocol<S
}
- public int getSoLinger() { return endpoint.getSoLinger(); }
- public void setSoLinger(int soLinger) { endpoint.setSoLinger(soLinger); }
+ public int getConnectionLinger() { return endpoint.getConnectionLinger(); }
+ public void setConnectionLinger(int connectionLinger) {
+ endpoint.setConnectionLinger(connectionLinger);
+ }
public int getKeepAliveTimeout() { return endpoint.getKeepAliveTimeout(); }
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1767305&r1=1767304&r2=1767305&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Oct 31 \
15:24:37 2016 @@ -437,10 +437,10 @@ public abstract class AbstractEndpoint<S
* @return The current socket linger time for sockets created by this
* endpoint
*/
- public int getSoLinger() { return socketProperties.getSoLingerTime(); }
- public void setSoLinger(int soLinger) {
- socketProperties.setSoLingerTime(soLinger);
- socketProperties.setSoLingerOn(soLinger>=0);
+ public int getConnectionLinger() { return socketProperties.getSoLingerTime(); }
+ public void setConnectionLinger(int connectionLinger) {
+ socketProperties.setSoLingerTime(connectionLinger);
+ socketProperties.setSoLingerOn(connectionLinger>=0);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic