This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 65e88d5 Remove TODOs
65e88d5 is described below
commit 65e88d5a1d8fa105bcef15a048bc12741d3a05fe
Author: remm <[email protected]>
AuthorDate: Wed May 26 17:22:49 2021 +0200
Remove TODOs
Java 11 seems fine (no report that it deadlocks on socket channel close
- best NIO feature ever). Also Java 11 will never be the minimum for
this branch.
---
java/org/apache/tomcat/util/net/NioEndpoint.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 5d8db75..9b71245 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -719,8 +719,6 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel,SocketChannel>
// If is important to cancel the key first, otherwise a
deadlock may occur between the
// poller select and the socket channel close which would
cancel the key
// This workaround is not needed on Java 11+
- // TODO: verify, if not fixed in Java 11+ then 14+ is
needed, see BZ 64007
- // TODO: the cancelledKey method can be removed with Java
11 as minimum
if (sk != null) {
sk.attach(null);
if (sk.isValid()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
