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

ARTEMIS-1604 Using default supportDirectDelivery=false 

This is to avoid races setting it to false on protocols that won't support direct Deliver
This commit is contained in:
Clebert Suconic 2019-03-11 09:33:39 -04:00 committed by Francesco Nigro
parent c83fce8db4
commit 0872f749a9
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
View File

@ -253,7 +253,7 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
private volatile boolean directDeliver = true;
private volatile boolean supportsDirectDeliver = true;
private volatile boolean supportsDirectDeliver = false;
private AddressSettingsRepositoryListener addressSettingsRepositoryListener;
@ -1078,9 +1078,13 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
throw ActiveMQMessageBundle.BUNDLE.maxConsumerLimitReachedForQueue(address, name);
}
if (consumers.isEmpty()) {
this.supportsDirectDeliver = consumer.supportsDirectDelivery();
} else {
if (!consumer.supportsDirectDelivery()) {
this.supportsDirectDeliver = false;
}
}
cancelRedistributor();
ConsumerHolder<Consumer> newConsumerHolder = new ConsumerHolder<>(consumer);
@ -1158,6 +1162,9 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
}
private boolean checkConsumerDirectDeliver() {
if (consumers.isEmpty()) {
return false;
}
boolean supports = true;
for (ConsumerHolder consumerCheck : consumers) {
if (!consumerCheck.consumer.supportsDirectDelivery()) {