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

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

commit a13162c5c12b9f8961bf4410b1683f3f1697361e
Author: remm <[email protected]>
AuthorDate: Mon Jan 26 10:42:36 2026 +0100

    NIO2 port
---
 java/org/apache/tomcat/util/net/SecureNio2Channel.java | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
index 3307d6516e..0a75377b9c 100644
--- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
+++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
@@ -144,13 +144,15 @@ public class SecureNio2Channel extends Nio2Channel {
     public void reset(AsynchronousSocketChannel channel, 
SocketWrapperBase<Nio2Channel> socket) throws IOException {
         super.reset(channel, socket);
         sslEngine = null;
-        sniComplete = false;
-        handshakeComplete = false;
-        handshakeWrapQueueLength.set(0);
-        unwrapBeforeRead = true;
-        closed = false;
-        closing = false;
-        netInBuffer.clear();
+        if (channel != null) {
+            sniComplete = false;
+            handshakeComplete = false;
+            handshakeWrapQueueLength.set(0);
+            unwrapBeforeRead = true;
+            closed = false;
+            closing = false;
+            netInBuffer.clear();
+        }
     }
 
     @Override


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to