[tomcat] branch 8.5.x updated: 66482: Restore inline state after async operation in NIO2

[remm]

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

remm 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 c12f22c181 66482: Restore inline state after async operation in NIO2
c12f22c181 is described below

commit c12f22c1816b327265bee8e5101898cc5a6fef79
Author: remm <r...@apache.org>
AuthorDate: Mon Feb 27 13:24:49 2023 +0100

    66482: Restore inline state after async operation in NIO2
    
    Patch submitted by zhougang.
---
 java/org/apache/tomcat/util/net/Nio2Endpoint.java | 7 +++++--
 webapps/docs/changelog.xml                        | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java 
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 4600348320..94c7543497 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -1042,8 +1042,11 @@ public class Nio2Endpoint extends 
AbstractJsseEndpoint<Nio2Channel,AsynchronousS
                     writeNotify = true;
                 }
                 Nio2Endpoint.startInline();
-                run();
-                Nio2Endpoint.endInline();
+                try {
+                    run();
+                } finally {
+                    Nio2Endpoint.endInline();
+                }
             }
 
             @Override
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1fef02d7d3..7ac3db9850 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -138,6 +138,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>
 </section>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org