From a7b06c043c34978125b57016a8bd82d9bb2fa6a5 Mon Sep 17 00:00:00 2001
From: gtully <gary.tully@gmail.com>
Date: Thu, 11 Jun 2020 19:55:38 +0100
Subject: [PATCH] AMQ-7497 - tidy up test cleanup for random order runs

---
 .../org/apache/activemq/ra/ActiveMQConnectionFactoryTest.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQConnectionFactoryTest.java b/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQConnectionFactoryTest.java
index 034e3d7752..c3af265f24 100644
--- a/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQConnectionFactoryTest.java
+++ b/activemq-ra/src/test/java/org/apache/activemq/ra/ActiveMQConnectionFactoryTest.java
@@ -99,6 +99,7 @@ public class ActiveMQConnectionFactoryTest {
         assertEquals(0, ((ActiveMQTopicSubscriber) sub).getPrefetchNumber());
 
         con.close();
+        ra.stop();
     }
 
     @Test(timeout = 60000)
@@ -167,6 +168,7 @@ public class ActiveMQConnectionFactoryTest {
             // should recover ok
             assertEquals("no pending transactions", 0, resources[0].recover(100).length);
 
+            ra.stop();
         } finally {
             brokerService.stop();
         }
@@ -214,6 +216,8 @@ public class ActiveMQConnectionFactoryTest {
             // should recover ok
             assertEquals("no pending transactions", 0, resources[0].recover(100).length);
 
+            ra.stop();
+
         } finally {
             brokerService.stop();
         }