You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/10/31 15:37:51 UTC
svn commit: r1767311 - in /tomcat/trunk/java/org/apache/coyote:
AbstractProtocol.java ajp/AbstractAjpProtocol.java
http11/AbstractHttp11Protocol.java
Author: markt
Date: Mon Oct 31 15:37:51 2016
New Revision: 1767311
URL: http://svn.apache.org/viewvc?rev=1767311&view=rev
Log:
Follow up to r1767250: remove soTimeout getter/setter
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.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=1767311&r1=1767310&r2=1767311&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Oct 31 15:37:51 2016
@@ -279,16 +279,6 @@ public abstract class AbstractProtocol<S
endpoint.setConnectionTimeout(timeout);
}
- /*
- * Alternative name for connectionTimeout property
- */
- public int getSoTimeout() {
- return getConnectionTimeout();
- }
- public void setSoTimeout(int timeout) {
- setConnectionTimeout(timeout);
- }
-
public int getMaxHeaderCount() {
return endpoint.getMaxHeaderCount();
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1767311&r1=1767310&r2=1767311&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Mon Oct 31 15:37:51 2016
@@ -43,7 +43,7 @@ public abstract class AbstractAjpProtoco
public AbstractAjpProtocol(AbstractEndpoint<S> endpoint) {
super(endpoint);
- setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
+ setConnectionTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
// AJP does not use Send File
getEndpoint().setUseSendfile(false);
ConnectionHandler<S> cHandler = new ConnectionHandler<>(this);
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1767311&r1=1767310&r2=1767311&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Mon Oct 31 15:37:51 2016
@@ -49,7 +49,7 @@ public abstract class AbstractHttp11Prot
public AbstractHttp11Protocol(AbstractEndpoint<S> endpoint) {
super(endpoint);
- setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
+ setConnectionTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
ConnectionHandler<S> cHandler = new ConnectionHandler<>(this);
setHandler(cHandler);
getEndpoint().setHandler(cHandler);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org