Author: kwall
Date: Wed Oct 1 14:16:07 2014
New Revision: 1628710
URL: http://svn.apache.org/r1628710
Log:
NO-JIRA: [Java Broker Tests] Prevent VirtualHostTest from orphaning
housekeeping threads
Modified:
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
Modified:
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java?rev=1628710&r1=1628709&r2=1628710&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
Wed Oct 1 14:16:07 2014
@@ -65,6 +65,7 @@ public class VirtualHostTest extends Qpi
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 Qpi
{
try
{
- _taskExecutor.stopImmediately();
+ try
+ {
+ _taskExecutor.stopImmediately();
+ }
+ finally
+ {
+ if (_virtualHost != null)
+ {
+ _virtualHost.close();
+ }
+ }
}
finally
{
@@ -386,6 +397,7 @@ public class VirtualHostTest extends Qpi
TestMemoryVirtualHost host = new TestMemoryVirtualHost(attributes,
_virtualHostNode);
host.create();
+ _virtualHost = host;
return host;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
