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

Merge pull request #620 from cshannon/AMQ-8169 

AMQ-8169: Synchronize on serviceRead inside NIOSSLTransport
This commit is contained in:
Jean-Baptiste Onofré 2021-03-09 21:19:27 +01:00 committed by GitHub
parent 2f40261362 1654e6c79c
commit f2a3fbda2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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; return readSize;
} }
//Prevent concurrent access to SSLEngine
@Override @Override
public void serviceRead() { public synchronized void serviceRead() {
try { try {
if (handshakeInProgress) { if (handshakeInProgress) {
doHandshake(); 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 @Override
public void serviceRead() { public synchronized void serviceRead() {
try { try {
if (handshakeInProgress) { if (handshakeInProgress) {
doHandshake(); doHandshake();