From 4e1df1979b963de468d873d19ec046361d18a039 Mon Sep 17 00:00:00 2001
From: jbonofre <jbonofre@apache.org>
Date: Mon, 22 Jun 2020 16:24:29 +0200
Subject: [PATCH] [AMQ-7493] Fix RejectedExecutionException in the
 BrokerService

---
 .../main/java/org/apache/activemq/broker/BrokerService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 419b4db2a0..0c7044f3ca 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
@@ -2860,12 +2860,12 @@ public class BrokerService implements Service {
                 @Override
                 public void rejectedExecution(final Runnable r, final ThreadPoolExecutor executor) {
                     try {
-                        executor.getQueue().offer(r, 60, TimeUnit.SECONDS);
+                        if (!executor.getQueue().offer(r, 60, TimeUnit.SECONDS)) {
+                            throw new RejectedExecutionException("Timed Out while attempting to enqueue Task.");
+                        }
                     } catch (InterruptedException e) {
                         throw new RejectedExecutionException("Interrupted waiting for BrokerService.worker");
                     }
-
-                    throw new RejectedExecutionException("Timed Out while attempting to enqueue Task.");
                 }
             });
         }