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

This closes #402

This commit is contained in:
jbertram 2016-02-23 14:22:43 -06:00
parent 5abf5d3fca 6bdfe95f66
commit 4da4f3734d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
View File

@ -110,7 +110,7 @@ public final class ReplicationManager implements ActiveMQComponent, ReadyListene
private volatile boolean enabled;
private final AtomicBoolean writable = new AtomicBoolean(false);
private final AtomicBoolean writable = new AtomicBoolean(true);
private final Object replicationLock = new Object();
@ -345,6 +345,7 @@ public final class ReplicationManager implements ActiveMQComponent, ReadyListene
pendingTokens.add(repliToken);
if (!replicatingChannel.getConnection().isWritable(this)) {
try {
writable.set(false);
//don't wait for ever as this may hang tests etc, we've probably been closed anyway
long now = System.currentTimeMillis();
long deadline = now + 5000;
@ -352,7 +353,6 @@ public final class ReplicationManager implements ActiveMQComponent, ReadyListene
replicationLock.wait(deadline - now);
now = System.currentTimeMillis();
}
writable.set(false);
}
catch (InterruptedException e) {
throw new ActiveMQInterruptedException(e);