From ee00221567809345ad84ffb1f585d6f8a677ae01 Mon Sep 17 00:00:00 2001 From: Pradeep Kunchala Date: Sat, 21 Feb 2026 19:53:21 +0530 Subject: [PATCH 1/2] Improve exception context in BrokerService preDestroy --- .../src/main/java/org/apache/activemq/broker/BrokerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java index e51d5214804..97433bd378d 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java @@ -788,7 +788,7 @@ private void preDestroy () { try { stop(); } catch (Exception ex) { - throw new RuntimeException(); + throw new RuntimeException("Exception during broker preDestroy cleanup: " + getBrokerName(), ex); } } From f4a6d22a2cf7182f210f565fdd653bec8df688a7 Mon Sep 17 00:00:00 2001 From: pradeep85841 Date: Tue, 24 Feb 2026 14:01:15 +0530 Subject: [PATCH 2/2] Fix CI failure in testPriorityMessagesWithJmsBrowser --- .../usecases/QueueZeroPrefetchLazyDispatchPriorityTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueZeroPrefetchLazyDispatchPriorityTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueZeroPrefetchLazyDispatchPriorityTest.java index dd4dd8e356f..5d43d07f6b0 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueZeroPrefetchLazyDispatchPriorityTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueZeroPrefetchLazyDispatchPriorityTest.java @@ -203,6 +203,10 @@ public void testPriorityMessagesWithJmsBrowser() throws Exception { final ArrayList consumeList = consumeMessages("TestQ"); LOG.info("Consumed list {}", consumeList.size()); + // wait until remaining messages are actually consumed + assertTrue("Remaining messages consumed", + Wait.waitFor(() -> consumeList.size() == numToSend - 1, 5000, 100)); + // compare lists // assertEquals("Iteration: " + i // +", message 1 should be priority high", 5,