Add change log entry for BZ 69982. Minor clean-up.

Author: markt-asf

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

@@ -1379,26 +1379,29 @@ private boolean socketOrNetworkBufferHasDataLeft() {
             return !socketBufferHandler.isWriteBufferEmpty() || getSocket().getOutboundRemaining() > 0;
         }
 
+
         /*
          * https://bz.apache.org/bugzilla/show_bug.cgi?id=69982
          *
-         * Similar to socketOrNetworkBufferHasDataLeft(), check the additional buffer for TLS
+         * Similar to socketOrNetworkBufferHasDataLeft(), check the additional buffer for TLS.
          */
         @Override
         public boolean hasDataToWrite() {
             return super.hasDataToWrite() || getSocket().getOutboundRemaining() > 0;
         }
 
+
         /*
          * https://bz.apache.org/bugzilla/show_bug.cgi?id=69982
          *
-         * Similar to socketOrNetworkBufferHasDataLeft(), check the additional buffer for TLS
+         * Similar to socketOrNetworkBufferHasDataLeft(), check the additional buffer for TLS.
          */
         @Override
         public boolean canWrite() {
             return super.canWrite() && getSocket().getOutboundRemaining() == 0;
         }
 
+
         @Override
         protected void doWrite(boolean block, ByteBuffer buffer) throws IOException {
             int n;

webapps/docs/changelog.xml

@@ -227,6 +227,12 @@
         being closed without a <code>GOAWAY</code> frame if an invalid
         <code>HEADERS</code> frame was received. (markt)
       </fix>
+      <fix>
+        <bug>69982</bug>: Fix a bug in the non-blocking flushing code for
+        NIO+TLS that meant that a response may not be fully written until the
+        connection is closed. Pull request <pr>966</pr> provided by Phil Clay.
+        (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">