mirror of https://github.com/apache/activemq.git
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:
parent
6d82e628f7
commit
8d34120d93
|
@ -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();
|
||||||
|
|
|
@ -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();
|
||||||
|
|
Loading…
Reference in New Issue