[tomcat] branch 9.0.x updated: Remove unnecessary code

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new f056baa  Remove unnecessary code
f056baa is described below

commit f056baa97638fca97cd5f19161fe4e6aea54eacf
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Nov 23 15:44:26 2020 +0000

    Remove unnecessary code
---
 java/org/apache/tomcat/util/net/NioEndpoint.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 7cdb8f3..159d55b 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -606,9 +606,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint<NioChannel,SocketChannel>
                 int interestOps = pe.getInterestOps();
                 if (sc == null) {
                     log.warn(sm.getString("endpoint.nio.nullSocketChannel"));
-                    if (socketWrapper != null) {
-                        socketWrapper.close();
-                    }
+                    socketWrapper.close();
                 } else if (interestOps == OP_REGISTER) {
                     try {
                         sc.register(getSelector(), SelectionKey.OP_READ, 
socketWrapper);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org