[activemq-artemis] branch main updated: no jira - fix intermittent checkthreadrule failure in JDBCJournalTest

[gt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gtully pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 9484e49  no jira - fix intermittent checkthreadrule failure in JDBCJournalTest
9484e49 is described below

commit 9484e49ab0bcf20570abebb8565681a238a36bc0
Author: gtully <ga...@gmail.com>
AuthorDate: Thu Jun 3 11:28:39 2021 +0100

    no jira - fix intermittent checkthreadrule failure in JDBCJournalTest
---
 .../artemis/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 7403151..f73ed46 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;