This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new af9d7d4 Fix NPE observed investigating current CI failuers
af9d7d4 is described below
commit af9d7d4f233e004d201404e05071996d04266836
Author: Mark Thomas <[email protected]>
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 0413434..3583a2d 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2343,7 +2343,10 @@ public class AprEndpoint extends AbstractEndpoint<Long>
implements SNICallBack {
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: [email protected]
For additional commands, e-mail: [email protected]
