This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new f7e2dce Move count down connections to the shared close f7e2dce is described below commit f7e2dce31d495dc972605416fedf239df981a2c3 Author: remm <r...@apache.org> AuthorDate: Wed Nov 6 18:11:39 2019 +0100 Move count down connections to the shared close --- java/org/apache/tomcat/util/net/AprEndpoint.java | 1 - java/org/apache/tomcat/util/net/Nio2Endpoint.java | 1 - java/org/apache/tomcat/util/net/NioEndpoint.java | 1 - java/org/apache/tomcat/util/net/SocketWrapperBase.java | 1 + 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index 6361756..0315075 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -791,7 +791,6 @@ public class AprEndpoint extends AbstractEndpoint<Long,Long> implements SNICallB // are closed when calling stop() followed by start(). if (socket != 0) { Socket.destroy(socket); - countDownConnection(); } } diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index afb8757..6ecba6a 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -917,7 +917,6 @@ public class Nio2Endpoint extends AbstractJsseEndpoint<Nio2Channel,AsynchronousS } try { synchronized (getSocket()) { - getEndpoint().countDownConnection(); if (getSocket().isOpen()) { getSocket().close(true); } diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index 0cb33f6..d059a70 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -1165,7 +1165,6 @@ public class NioEndpoint extends AbstractJsseEndpoint<NioChannel,SocketChannel> } try { synchronized (getSocket()) { - getEndpoint().countDownConnection(); if (getSocket().isOpen()) { getSocket().close(true); } diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java b/java/org/apache/tomcat/util/net/SocketWrapperBase.java index 2f4fb42..169fbfa 100644 --- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java +++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java @@ -410,6 +410,7 @@ public abstract class SocketWrapperBase<E> { } } finally { getEndpoint().connections.remove(socket); + getEndpoint().countDownConnection(); doClose(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org