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

https://issues.apache.org/jira/browse/AMQ-4107 - apply patch - resolved intermittent failure of TwoMulticastDiscoveryBrokerTopicSendReceiveTest

This commit is contained in:
gtully 2015-01-12 11:59:51 +00:00
parent 3e007d89a2
commit 8dbb48a23f
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
activemq-broker/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
View File

@ -106,6 +106,7 @@ public class TopicSubscription extends AbstractSubscription {
// locator /w the message. // locator /w the message.
node = new IndirectMessageReference(node.getMessage()); node = new IndirectMessageReference(node.getMessage());
enqueueCounter.incrementAndGet(); enqueueCounter.incrementAndGet();
synchronized (matchedListMutex) {
if (!isFull() && matched.isEmpty()) { if (!isFull() && matched.isEmpty()) {
// if maximumPendingMessages is set we will only discard messages which // if maximumPendingMessages is set we will only discard messages which
// have not been dispatched (i.e. we allow the prefetch buffer to be filled) // have not been dispatched (i.e. we allow the prefetch buffer to be filled)
@ -125,7 +126,6 @@ public class TopicSubscription extends AbstractSubscription {
if (maximumPendingMessages != 0) { if (maximumPendingMessages != 0) {
boolean warnedAboutWait = false; boolean warnedAboutWait = false;
while (active) { while (active) {
synchronized (matchedListMutex) {
while (matched.isFull()) { while (matched.isFull()) {
if (getContext().getStopping().get()) { if (getContext().getStopping().get()) {
LOG.warn("{}: stopped waiting for space in pendingMessage cursor for: {}", toString(), node.getMessageId()); LOG.warn("{}: stopped waiting for space in pendingMessage cursor for: {}", toString(), node.getMessageId());
@ -150,9 +150,6 @@ public class TopicSubscription extends AbstractSubscription {
break; break;
} }
} }
}
synchronized (matchedListMutex) {
// NOTE - be careful about the slaveBroker!
if (maximumPendingMessages > 0) { if (maximumPendingMessages > 0) {
// calculate the high water mark from which point we // calculate the high water mark from which point we
// will eagerly evict expired messages // will eagerly evict expired messages
@ -195,11 +192,11 @@ public class TopicSubscription extends AbstractSubscription {
} }
} }
} }
}
dispatchMatched(); dispatchMatched();
} }
} }
} }
}
private boolean isDuplicate(MessageReference node) { private boolean isDuplicate(MessageReference node) {
boolean duplicate = false; boolean duplicate = false;

2
activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
View File

@ -21,7 +21,7 @@ import javax.jms.JMSException;
import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory;
/** /**
* * reproduced: https://issues.apache.org/jira/browse/AMQ-4107
*/ */
public class TwoMulticastDiscoveryBrokerTopicSendReceiveTest extends TwoBrokerTopicSendReceiveTest { public class TwoMulticastDiscoveryBrokerTopicSendReceiveTest extends TwoBrokerTopicSendReceiveTest {