15 files changed, 48 insertions, 19 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
index b9b3168fcc..b94f2ef76f 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
@@ -28,7 +28,6 @@ import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.client.transport.TransportConnection;
 
 public class AMQBrokerManagerMBeanTest extends TestCase
 {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/TxAckTest.java
index aafddb810a..aa7cbbdf3c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/TxAckTest.java
@@ -68,6 +68,14 @@ public class TxAckTest extends TestCase
         combined.update(1, false);//should be ignored
         combined.update(10, false);
     }
+    
+    @Override
+    protected void tearDown() throws Exception
+    {
+    	individual.stop();
+    	multiple.stop();
+    	combined.stop();
+    }
 
     public void testPrepare() throws AMQException
     {
@@ -102,6 +110,7 @@ public class TxAckTest extends TestCase
         private final List<Long> _acked;
         private final List<Long> _unacked;
         private StoreContext _storeContext = new StoreContext();
+		private AMQQueue _queue;
 
         Scenario(int messageCount, List<Long> acked, List<Long> unacked) throws Exception
         {
@@ -109,9 +118,8 @@ public class TxAckTest extends TestCase
                                                                           _storeContext, null,
                                                                           new LinkedList<RequiredDeliveryException>()
             );
-            AMQQueue queue =
-                    AMQQueueFactory.createAMQQueueImpl(new AMQShortString("test"), false, null, false, new VirtualHost("test", new MemoryMessageStore()),
-                                                       null);
+            _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("test"), false, null, false, new VirtualHost("test", new MemoryMessageStore()),
+			                                   null);
 
             for (int i = 0; i < messageCount; i++)
             {
@@ -147,7 +155,7 @@ public class TxAckTest extends TestCase
                 };
 
                 TestMessage message = new TestMessage(deliveryTag, i, info, txnContext.getStoreContext());
-                _map.add(deliveryTag, queue.enqueue(new StoreContext(), message));
+                _map.add(deliveryTag, _queue.enqueue(new StoreContext(), message));
             }
             _acked = acked;
             _unacked = unacked;
@@ -201,6 +209,11 @@ public class TxAckTest extends TestCase
             keys.removeAll(_map.getDeliveryTags());
             assertTrue("Expected messages with following tags to still be in map: " + keys, keys.isEmpty());
         }
+        
+        public void stop()
+        {
+        	_queue.stop();
+        }
     }
 
     private static AMQMessageHandle createMessageHandle(final long messageId, final MessagePublishInfo publishBody)
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 6dcb187a37..6dcb187a37 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index fd11ddeae2..fd11ddeae2 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
index 0762a7a561..0762a7a561 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/plugins/PluginTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
index 8e7038eec3..8e7038eec3 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
index 62f5e0c6bf..307dcf66fe 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
@@ -33,38 +33,54 @@ import org.apache.qpid.protocol.AMQConstant;
 /** Test class to test MBean operations for AMQMinaProtocolSession. */
 public class MaxChannelsTest extends TestCase
 {
-//    private MessageStore _messageStore = new SkeletonMessageStore();
+	private IApplicationRegistry _appRegistry;
+	private AMQMinaProtocolSession _session;
 
     public void testChannels() throws Exception
     {
-        IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
-        AMQMinaProtocolSession _protocolSession = new AMQMinaProtocolSession(new MockIoSession(),
-                                                                             appRegistry.getVirtualHostRegistry(),
-                                                                             new AMQCodecFactory(true),
-                                                                             null);
-        _protocolSession.setVirtualHost(appRegistry.getVirtualHostRegistry().getVirtualHost("test"));
+        _session = new AMQMinaProtocolSession(new MockIoSession(), _appRegistry
+				.getVirtualHostRegistry(), new AMQCodecFactory(true), null);
+        _session.setVirtualHost(_appRegistry.getVirtualHostRegistry().getVirtualHost("test"));
 
         // check the channel count is correct
-        int channelCount = _protocolSession.getChannels().size();
+        int channelCount = _session.getChannels().size();
         assertEquals("Initial channel count wrong", 0, channelCount);
 
         long maxChannels = 10L;
-        _protocolSession.setMaximumNumberOfChannels(maxChannels);
-        assertEquals("Number of channels not correctly set.", new Long(maxChannels), _protocolSession.getMaximumNumberOfChannels());
+        _session.setMaximumNumberOfChannels(maxChannels);
+        assertEquals("Number of channels not correctly set.", new Long(maxChannels), _session.getMaximumNumberOfChannels());
 
 
         try
         {
             for (long currentChannel = 0L; currentChannel < maxChannels; currentChannel++)
             {
-                _protocolSession.addChannel(new AMQChannel(_protocolSession, (int) currentChannel, null));
+                _session.addChannel(new AMQChannel(_session, (int) currentChannel, null));
             }
         }
         catch (AMQException e)
         {
             assertEquals("Wrong exception recevied.", e.getErrorCode(), AMQConstant.NOT_ALLOWED);
         }
-        assertEquals("Maximum number of channels not set.", new Long(maxChannels), new Long(_protocolSession.getChannels().size()));
+        assertEquals("Maximum number of channels not set.", new Long(maxChannels), new Long(_session.getChannels().size()));
+    }
+    
+    @Override
+    public void setUp()
+    {
+        _appRegistry = ApplicationRegistry.getInstance(1);
+    }
+    
+    @Override
+    public void tearDown()
+    {
+    	try {
+			_session.closeSession();
+		} catch (AMQException e) {
+			// Yikes
+			fail(e.getMessage());
+		}
+    	ApplicationRegistry.remove(1);
     }
 
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MockIoSession.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MockIoSession.java
index cf6366b513..cf6366b513 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MockIoSession.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MockIoSession.java
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
index 9c2932c5e2..9c2932c5e2 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java
index 99c88fac3e..99c88fac3e 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MockProtocolSession.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
index f76c652793..f45d887dec 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
@@ -35,6 +35,7 @@ public class SimpleAMQQueueThreadPoolTest extends TestCase
 
     public void test() throws AMQException
     {
+        assertEquals("References exist before start!", 0, ReferenceCountingExecutorService.getInstance().getReferenceCount());
         VirtualHost test = ApplicationRegistry.getInstance(1).getVirtualHostRegistry().getVirtualHost("test");
 
         try
@@ -43,8 +44,8 @@ public class SimpleAMQQueueThreadPoolTest extends TestCase
                                                                                        new AMQShortString("owner"),
                                                                                        false, test, null);
 
-            assertTrue("Creation did not start Pool.", !ReferenceCountingExecutorService.getInstance().getPool().isShutdown());
-
+            assertFalse("Creation did not start Pool.", ReferenceCountingExecutorService.getInstance().getPool().isShutdown());
+            
             queue.stop();
 
             assertEquals("References still exist", 0, ReferenceCountingExecutorService.getInstance().getReferenceCount());
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
index f08a15a8a7..f08a15a8a7 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SkeletonMessageStore.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/TestMemoryMessageStore.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java
index 4e48435962..4e48435962 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/TestMemoryMessageStore.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
index 2346660d25..2346660d25 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java
index 84d3d313d1..84d3d313d1 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/txn/TxnBufferTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/TxnBufferTest.java