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

Merge branch 'AMQ-8287' into main 

This closes #666
This commit is contained in:
Christopher L. Shannon (cshannon) 2021-06-02 13:52:42 -04:00
parent ba455e8c5f 2fcf2fd75f
commit ac27cc2cda
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; return readSize;
} }
//Prevent concurrent access to SSLEngine
@Override @Override
public synchronized void serviceRead() { public void serviceRead() {
try { try {
if (handshakeInProgress) { if (handshakeInProgress) {
doHandshake(); 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 @Override
public synchronized void serviceRead() { public void serviceRead() {
try { try {
if (handshakeInProgress) { if (handshakeInProgress) {
doHandshake(); 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) { if (!(inputBuffer.position() != 0 && inputBuffer.hasRemaining()) || status == SSLEngineResult.Status.BUFFER_UNDERFLOW) {
int bytesRead = channel.read(inputBuffer); int bytesRead = channel.read(inputBuffer);