[tomcat] branch 9.0.x updated: Fix NPE observed investigating current CI failuers

[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 6d29ec5  Fix NPE observed investigating current CI failuers
6d29ec5 is described below

commit 6d29ec5e1fe4ba92bcf0dc03a06d054338123df7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Nov 11 10:11:49 2021 +0000

    Fix NPE observed investigating current CI failuers
---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 3a3aa0b..7599670 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2339,7 +2339,10 @@ public class AprEndpoint extends 
AbstractEndpoint<Long,Long> implements SNICallB
             if (sslOutputBuffer != null) {
                 ByteBufferUtils.cleanDirectBuffer(sslOutputBuffer);
             }
-            ((AprEndpoint) 
getEndpoint()).getPoller().close(getSocket().longValue());
+            Poller poller = ((AprEndpoint) getEndpoint()).getPoller();
+            if (poller != null) {
+                poller.close(getSocket().longValue());
+            }
         }
 
 

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