This is an automated email from the ASF dual-hosted git repository. markt 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 913e941 Polish. Align with 8.5.x. 913e941 is described below commit 913e941b2daeed074c2cf8f2381b1ba7c48e0ca7 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Nov 19 13:25:01 2019 +0000 Polish. Align with 8.5.x. --- java/org/apache/tomcat/util/net/AprEndpoint.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index 1d40f29..146a816 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -1060,7 +1060,7 @@ public class AprEndpoint extends AbstractEndpoint<Long,Long> implements SNICallB * for a maximum of two events (read and write) at any one * time. * - * Therefore size is actual poller size *4. + * Therefore size is poller size *4. */ desc = new long[pollerSize * 4]; connectionCount.set(0); @@ -1112,7 +1112,7 @@ public class AprEndpoint extends AbstractEndpoint<Long,Long> implements SNICallB while (info != null) { // Make sure we aren't trying add the socket as well as close it addList.remove(info.socket); - // Make sure the socket isn't in the poller before we close it + // Make sure the socket isn't in the poller before we close it removeFromPoller(info.socket); // Poller isn't running at this point so use destroySocket() // directly @@ -1123,7 +1123,7 @@ public class AprEndpoint extends AbstractEndpoint<Long,Long> implements SNICallB // Close all sockets in the add queue info = addList.get(); while (info != null) { - // Make sure the socket isn't in the poller before we close it + // Make sure the socket isn't in the poller before we close it removeFromPoller(info.socket); // Poller isn't running at this point so use destroySocket() // directly @@ -1998,7 +1998,6 @@ public class AprEndpoint extends AbstractEndpoint<Long,Long> implements SNICallB } } } - } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org