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

AMQ-8169: Synchronize on serviceRead inside NIOSSLTransport 

This is needed to prevent concurrent access to the SSLEngine during
initialization. This is a regression from when auto+nio+ssl was added.

(cherry picked from commit 1654e6c79c)
This commit is contained in:
Christopher L. Shannon (cshannon) 2021-03-08 11:27:54 -05:00 committed by jbonofre
parent 6d82e628f7
commit 8d34120d93
2 changed files with 4 additions and 2 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,8 +158,9 @@ public class AutoInitNioSSLTransport extends NIOSSLTransport {
return readSize;
}
//Prevent concurrent access to SSLEngine
@Override
public void serviceRead() {
public synchronized void serviceRead() {
try {
if (handshakeInProgress) {
doHandshake();

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

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