[tomcat] branch main updated: Fix a regresssion in the Loom refactoring

[markt]

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 7d4a1d5846 Fix a regresssion in the Loom refactoring
7d4a1d5846 is described below

commit 7d4a1d584650c4b04b470ed9f831c4d4c2dc978a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 23 14:01:50 2022 +0100

    Fix a regresssion in the Loom refactoring
---
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 ++--
 webapps/docs/changelog.xml                            | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 598fac7a8c..426d0bfa9c 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1950,7 +1950,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
                     socketWrapper.write(true, payload, 0, payload.length);
                     socketWrapper.flush(true);
                 } finally {
-                    socketWrapper.getLock().lock();
+                    socketWrapper.getLock().unlock();
                 }
             }
         }
@@ -1987,7 +1987,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
                     socketWrapper.write(true, payload, 0, payload.length);
                     socketWrapper.flush(true);
                 } finally {
-                    socketWrapper.getLock().lock();
+                    socketWrapper.getLock().unlock();
                 }
             }
         }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e8e5a1bac8..5b08100d1a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,10 @@
         Update experimental Panama modules with support for OpenSSL 3.0+.
         OpenSSL 1.1 remains supported. (remm)
       </update>
+      <fix>
+        Correct a regression in the refactoring to support experimentation with
+        project Loom that broke HTTP/2 support if async IO was disabled. 
(markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">


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