From 7dab767aac64855288371305678892035ade0835 Mon Sep 17 00:00:00 2001
From: Pradeep Kunchala <pkunchala@sgp-india.com>
Date: Sat, 21 Feb 2026 19:53:21 +0530
Subject: [PATCH] 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);
         }
     }