From dev-return-203122-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org Wed Nov 6 17:12:03 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 5E36A180651 for ; Wed, 6 Nov 2019 18:12:03 +0100 (CET) Received: (qmail 12665 invoked by uid 500); 6 Nov 2019 17:11:54 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 12565 invoked by uid 99); 6 Nov 2019 17:11:54 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Nov 2019 17:11:54 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C928F805E6; Wed, 6 Nov 2019 17:11:53 +0000 (UTC) Date: Wed, 06 Nov 2019 17:11:53 +0000 To: "dev@tomcat.apache.org" Subject: [tomcat] branch master updated: Move count down connections to the shared close MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157306031371.12148.1223710083927550343@gitbox.apache.org> From: remm@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: tomcat X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d3b4844d07b76fdf8cd2ff7d28a6f6fe21ea0596 X-Git-Newrev: f7e2dce31d495dc972605416fedf239df981a2c3 X-Git-Rev: f7e2dce31d495dc972605416fedf239df981a2c3 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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 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 } 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 { } } finally { getEndpoint().connections.remove(socket); + getEndpoint().countDownConnection(); doClose(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org