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

ARTEMIS-474 Avoiding one lock around the readyListener call tree and fixing ReplicationManager / NettyConnection deadlock

This commit is contained in:
Clebert Suconic 2016-04-06 12:58:50 -04:00
parent 2e894554ca
commit 3ecd8b7c44
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
View File

@ -106,25 +106,41 @@ public class NettyConnection implements Connection {
}
@Override
public synchronized boolean isWritable(ReadyListener callback) {
if (!ready) {
readyListeners.push(callback);
}
public boolean isWritable(ReadyListener callback) {
synchronized (readyListeners) {
if (!ready) {
readyListeners.push(callback);
}
return ready;
return ready;
}
}
@Override
public synchronized void fireReady(final boolean ready) {
this.ready = ready;
public void fireReady(final boolean ready) {
LinkedList<ReadyListener> readyToCall = null;
synchronized (readyListeners) {
this.ready = ready;
if (ready) {
for (;;) {
ReadyListener readyListener = readyListeners.poll();
if (readyListener == null) {
return;
if (ready) {
for (;;) {
ReadyListener readyListener = readyListeners.poll();
if (readyListener == null) {
break;
}
if (readyToCall == null) {
readyToCall = new LinkedList<>();
}
readyToCall.add(readyListener);
}
}
}
if (readyToCall != null) {
for (ReadyListener readyListener : readyToCall) {
try {
readyListener.readyForWriting();
}