This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new baeb8ce2f1 Align with 10.1.x/11.0.x
baeb8ce2f1 is described below
commit baeb8ce2f1737c4324e389f318919d9646abca14
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jul 23 11:12:51 2024 +0100
Align with 10.1.x/11.0.x
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 81c4908047..312a9eb7e4 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -685,7 +685,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
byte[] payloadLength = new byte[3];
ByteUtil.setThreeBytes(payloadLength, 0, len);
- socketWrapper.getLock().lock();
+ Lock lock = socketWrapper.getLock();
+ lock.lock();
try {
socketWrapper.write(true, payloadLength, 0, payloadLength.length);
socketWrapper.write(true, GOAWAY, 0, GOAWAY.length);
@@ -695,18 +696,19 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
}
socketWrapper.flush(true);
} finally {
- socketWrapper.getLock().unlock();
+ lock.unlock();
}
}
void writeHeaders(Stream stream, int pushedStreamId, MimeHeaders
mimeHeaders, boolean endOfStream, int payloadSize)
throws IOException {
// This ensures the Stream processing thread has control of the socket.
- socketWrapper.getLock().lock();
+ Lock lock = socketWrapper.getLock();
+ lock.lock();
try {
doWriteHeaders(stream, pushedStreamId, mimeHeaders, endOfStream,
payloadSize);
} finally {
- socketWrapper.getLock().unlock();
+ lock.unlock();
}
stream.sentHeaders();
if (endOfStream) {
@@ -909,7 +911,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
protected void processWrites() throws IOException {
- socketWrapper.getLock().lock();
+ Lock lock = socketWrapper.getLock();
+ lock.lock();
try {
if (socketWrapper.flush(false)) {
socketWrapper.registerWriteInterest();
@@ -919,7 +922,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
pingManager.sendPing(false);
}
} finally {
- socketWrapper.getLock().unlock();
+ lock.unlock();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
