Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-8287 - fix NIOSSLTransport deadlock with serviceRead lock 

This narrows the lock that was added to serviceRead() to secureRead()
which prevents processing commands while locked which should solve the
deadlock issues

(cherry picked from commit 2fcf2fd75f)
This commit is contained in:
Christopher L. Shannon (cshannon) 2021-06-02 09:47:24 -04:00
parent 7521d49402
commit 0f952f72f7
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activemq-broker/src/main/java/org/apache/activemq/transport/nio/AutoInitNioSSLTransport.java
View File

@ -158,9 +158,8 @@ public class AutoInitNioSSLTransport extends NIOSSLTransport {
return readSize;
}
//Prevent concurrent access to SSLEngine
@Override
public synchronized void serviceRead() {
public void serviceRead() {
try {
if (handshakeInProgress) {
doHandshake();

6
activemq-client/src/main/java/org/apache/activemq/transport/nio/NIOSSLTransport.java
View File

@ -243,9 +243,8 @@ public class NIOSSLTransport extends NIOTransport {
}
}
//Prevent concurrent access to SSLEngine
@Override
public synchronized void serviceRead() {
public void serviceRead() {
try {
if (handshakeInProgress) {
doHandshake();
@ -374,7 +373,8 @@ public class NIOSSLTransport extends NIOTransport {
}
}
protected int secureRead(ByteBuffer plain) throws Exception {
//Prevent concurrent access while reading from the channel
protected synchronized int secureRead(ByteBuffer plain) throws Exception {
if (!(inputBuffer.position() != 0 && inputBuffer.hasRemaining()) || status == SSLEngineResult.Status.BUFFER_UNDERFLOW) {
int bytesRead = channel.read(inputBuffer);