Avoid changing channel state on reset(null,null)

BZ69938

Author: rmaucher

java/org/apache/tomcat/util/net/SecureNioChannel.java

@@ -94,11 +94,13 @@ public SecureNioChannel(SocketBufferHandler bufHandler, NioEndpoint endpoint) {
     public void reset(SocketChannel channel, NioSocketWrapper socketWrapper) throws IOException {
         super.reset(channel, socketWrapper);
         sslEngine = null;
-        sniComplete = false;
-        handshakeComplete = false;
-        closed = false;
-        closing = false;
-        netInBuffer.clear();
+        if (channel != null) {
+            sniComplete = false;
+            handshakeComplete = false;
+            closed = false;
+            closing = false;
+            netInBuffer.clear();
+        }
     }
 
     @Override

webapps/docs/changelog.xml

@@ -228,6 +228,10 @@
         shutdown that triggered a significant memory leak. Patch provided by
         Wes. (markt)
       </fix>
+      <fix>
+        <bug>69938</bug>: Avoid changing the closed state of TLS channel when
+        resetting it after close. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">