NO-JIRA: [Java Broker Tests] Prevent VirtualHostTest from orphaning housekeeping threads

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1628710 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 13 insertions, 1 deletions

diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
index db5cf1a7ba..ba6b0d95f3 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
@@ -65,6 +65,7 @@ public class VirtualHostTest extends QpidTestCase
     private TaskExecutor _taskExecutor;
     private VirtualHostNode<?> _virtualHostNode;
     private DurableConfigurationStore _configStore;
+    private VirtualHost<?, ?, ?> _virtualHost;
 
     @Override
     protected void setUp() throws Exception
@@ -94,7 +95,17 @@ public class VirtualHostTest extends QpidTestCase
     {
         try
         {
-            _taskExecutor.stopImmediately();
+            try
+            {
+                _taskExecutor.stopImmediately();
+            }
+            finally
+            {
+                if (_virtualHost != null)
+                {
+                    _virtualHost.close();
+                }
+            }
         }
         finally
         {
@@ -386,6 +397,7 @@ public class VirtualHostTest extends QpidTestCase
 
         TestMemoryVirtualHost host = new TestMemoryVirtualHost(attributes, _virtualHostNode);
         host.create();
+        _virtualHost = host;
         return host;
     }