Skip to content

Commit 21e6684

Browse files
ARTEMIS-5815 countMessages(Filter) should not limit the browsing operation
1 parent fd2fb06 commit 21e6684

File tree

2 files changed

+2
-4
lines changed
  • artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl
  • tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management

2 files changed

+2
-4
lines changed

artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,11 +1091,9 @@ private Map<String, Long> internalCountMessages(final String filterStr, final St
10911091
if (filter == null && groupByProperty == null) {
10921092
result.put(null, getMessageCount());
10931093
} else {
1094-
final int limit = addressSettingsRepository.getMatch(address).getManagementBrowsePageSize();
1095-
int count = 0;
10961094
try (LinkedListIterator<MessageReference> iterator = queue.browserIterator()) {
10971095
try {
1098-
while (iterator.hasNext() && count++ < limit) {
1096+
while (iterator.hasNext()) {
10991097
Message message = iterator.next().getMessage();
11001098
internalComputeMessage(result, filter, groupByProperty, message);
11011099
}

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4818,7 +4818,7 @@ public void testBrowseLimitOnListBrowseAndFilteredCount() throws Exception {
48184818
assertEquals(5, array.size());
48194819

48204820
// filer could match all
4821-
assertEquals(5, queueControl.countMessages("AMQSize > 0"));
4821+
assertEquals(10, queueControl.countMessages("AMQSize > 0"));
48224822

48234823
session.deleteQueue(queue);
48244824
}

0 commit comments

Comments
 (0)