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

ARTEMIS-2797 Fixing updateQueue on filter / fixing ActiveMQServerControlTest

This commit is contained in:
Clebert Suconic 2020-07-06 21:45:27 -04:00
parent 6cc370e169
commit 3f99c4b846
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -701,7 +701,7 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
final SimpleString empty = new SimpleString("");
Filter oldFilter = FilterImpl.createFilter(queue.getFilter() == null ? empty : queue.getFilter().getFilterString());
Filter newFilter = FilterImpl.createFilter(queueConfiguration.getFilterString() == null ? empty : queueConfiguration.getFilterString());
if ((forceUpdate || newFilter != null) && !Objects.equals(oldFilter, newFilter)) {
if ((forceUpdate || newFilter != oldFilter) && !Objects.equals(oldFilter, newFilter)) {
changed = true;
queue.setFilter(newFilter);
}

4
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
View File

@ -514,8 +514,8 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
producer.send(m);
assertNotNull(consumer1.receiveImmediate());
assertNotNull(consumer2.receiveImmediate());
assertNotNull(consumer1.receive(1000));
assertNotNull(consumer2.receive(1000));
}
@Test