From 9484e49ab0bcf20570abebb8565681a238a36bc0 Mon Sep 17 00:00:00 2001
From: gtully <gary.tully@gmail.com>
Date: Thu, 3 Jun 2021 11:28:39 +0100
Subject: [PATCH] no jira - fix intermittent checkthreadrule failure in
 JDBCJournalTest

---
 .../tests/integration/jdbc/store/journal/JDBCJournalTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java
index 74031516d2..f73ed4650d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java
@@ -88,7 +88,8 @@ public class JDBCJournalTest extends ActiveMQTestBase {
          System.clearProperty("derby.connection.requireAuthentication");
          System.clearProperty("derby.user." + getJdbcUser());
       }
-      scheduledExecutorService.shutdown();
+      scheduledExecutorService.shutdownNow();
+      scheduledExecutorService.awaitTermination(5, TimeUnit.SECONDS);
       scheduledExecutorService = null;
       executorService.shutdown();
       executorService = null;