[tomcat] branch main updated: Fix IDE warning re NPE

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 689438c  Fix IDE warning re NPE
689438c is described below

commit 689438c04bba34b1a81c5ccbcefdc3b8f8c9a654
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 27 16:51:24 2021 +0100

    Fix IDE warning re NPE
---
 java/org/apache/tomcat/util/net/NioEndpoint.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index e69fc74..4181ba2 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1022,7 +1022,9 @@ public class NioEndpoint extends 
AbstractJsseEndpoint<NioChannel,SocketChannel>
                             }
                         }
                     } catch (CancelledKeyException ckx) {
-                        socketWrapper.close();
+                        if (socketWrapper != null) {
+                            socketWrapper.close();
+                        }
                     }
                 }
             } catch (ConcurrentModificationException cme) {

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