Merge branch 'main' of https://gitbox.apache.org/repos/asf/tomcat

Author: rainerjung

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

@@ -1028,8 +1028,11 @@ protected void start() {
                     writeNotify = true;
                 }
                 Nio2Endpoint.startInline();
-                run();
-                Nio2Endpoint.endInline();
+                try {
+                    run();
+                } finally {
+                    Nio2Endpoint.endInline();
+                }
             }
 
             @Override

webapps/docs/changelog.xml

@@ -137,6 +137,11 @@
         Add a check for the validity of the scheme pseudo-header in HTTP/2.
         (markt)
       </add>
+      <fix>
+        <bug>66482</bug>: Restore inline state after async operation in NIO2,
+        to account the fact that unexpected exceptions are sometimes thrown
+        by the implementation. Patch submitted by zhougang. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">