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 #3501

This commit is contained in:
Clebert Suconic 2021-03-18 18:08:42 -04:00
parent 76b76c56e9 8d848f4615
commit 02ec0bfe42
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
View File

@ -437,9 +437,7 @@ public final class BindingsImpl implements Bindings {
}
}
Filter filter = binding.getFilter();
if (filter == null || filter.match(message)) {
if (matchBinding(message, binding)) {
// bindings.length == 1 ==> only a local queue so we don't check for matching consumers (it's an
// unnecessary overhead)
if (length == 1 || (binding.isConnected() && (messageLoadBalancingType.equals(MessageLoadBalancingType.STRICT) || binding.isHighAcceptPriority(message)))) {
@ -486,29 +484,21 @@ public final class BindingsImpl implements Bindings {
if (pos != startPos) {
routingNamePositions.put(routingName, pos);
}
if (messageLoadBalancingType.equals(MessageLoadBalancingType.OFF) && theBinding instanceof RemoteQueueBinding) {
if (exclusivelyRemote(bindings)) {
theBinding = null;
} else {
theBinding = getNextBinding(message, routingName, bindings);
}
}
return theBinding;
}
private boolean exclusivelyRemote(List<Binding> bindings) {
boolean result = true;
for (Binding binding : bindings) {
if (!(binding instanceof RemoteQueueBinding)) {
result = false;
break;
}
private boolean matchBinding(Message message, Binding binding) {
if (messageLoadBalancingType.equals(MessageLoadBalancingType.OFF) && binding instanceof RemoteQueueBinding) {
return false;
}
return result;
Filter filter = binding.getFilter();
if (filter == null || filter.match(message)) {
return true;
} else {
return false;
}
}
private void routeUsingStrictOrdering(final Message message,

21
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/RemoteBindingWithoutLoadBalancingTest.java
View File

@ -66,6 +66,27 @@ public class RemoteBindingWithoutLoadBalancingTest extends ClusterTestBase {
send(1, "queues.testaddress", 1, false, null);
}
@Test
public void testStackOverflowWithLocalConsumerAndFilter() throws Exception {
setupCluster();
startServers();
setupSessionFactory(0, isNetty());
setupSessionFactory(1, isNetty());
createQueue(0, "queues.testaddress", "queue0", "0", true);
createQueue(1, "queues.testaddress", "queue0", "1", true);
waitForBindings(0, "queues.testaddress", 1, 0, true);
waitForBindings(1, "queues.testaddress", 1, 0, false);
for (int i = 0; i < 10; i++) {
send(1, "queues.testaddress", 10, false, "" + i % 2);
}
}
@Test
public void testStackOverflowJMS() throws Exception {
final String QUEUE_NAME = "queues.queue0";