QPID-2857 : Address issues found by running FindBugs against the Java codebase

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

26 files changed, 329 insertions, 271 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
index 9ef4af2932..b3223f16c4 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
@@ -33,19 +33,19 @@ public class AcknowledgeTest extends InternalBrokerBaseCase
 
     public void testTransactionalSingleAck() throws AMQException
     {
-        _channel.setLocalTransactional();
+        getChannel().setLocalTransactional();
         runMessageAck(1, 1, 1, false, 0);
     }
 
     public void testTransactionalMultiAck() throws AMQException
     {
-        _channel.setLocalTransactional();
+        getChannel().setLocalTransactional();
         runMessageAck(10, 1, 5, true, 5);
     }
 
     public void testTransactionalAckAll() throws AMQException
     {
-        _channel.setLocalTransactional();
+        getChannel().setLocalTransactional();
         runMessageAck(10, 1, 0, true, 0);
     }
 
@@ -70,31 +70,31 @@ public class AcknowledgeTest extends InternalBrokerBaseCase
         checkStoreContents(0);
 
         //Send required messsages to the queue
-        publishMessages(_session, _channel, sendMessageCount);
+        publishMessages(getSession(), getChannel(), sendMessageCount);
 
-        if (_channel.isTransactional())
+        if (getChannel().isTransactional())
         {
-            _channel.commit();
+            getChannel().commit();
         }
 
         //Ensure they are stored
         checkStoreContents(sendMessageCount);
 
         //Check that there are no unacked messages
-        assertEquals("Channel should have no unacked msgs ", 0, _channel.getUnacknowledgedMessageMap().size());
+        assertEquals("Channel should have no unacked msgs ", 0, getChannel().getUnacknowledgedMessageMap().size());
 
         //Subscribe to the queue
-        AMQShortString subscriber = subscribe(_session, _channel, _queue);
+        AMQShortString subscriber = subscribe(getSession(), getChannel(), getQueue());
 
-        _queue.deliverAsync();
+        getQueue().deliverAsync();
 
         //Wait for the messages to be delivered
-        _session.awaitDelivery(sendMessageCount);
+        getSession().awaitDelivery(sendMessageCount);
 
         //Check that they are all waiting to be acknoledged
-        assertEquals("Channel should have unacked msgs", sendMessageCount, _channel.getUnacknowledgedMessageMap().size());
+        assertEquals("Channel should have unacked msgs", sendMessageCount, getChannel().getUnacknowledgedMessageMap().size());
 
-        List<InternalTestProtocolSession.DeliveryPair> messages = _session.getDelivers(_channel.getChannelId(), subscriber, sendMessageCount);
+        List<InternalTestProtocolSession.DeliveryPair> messages = getSession().getDelivers(getChannel().getChannelId(), subscriber, sendMessageCount);
 
         //Double check we received the right number of messages
         assertEquals(sendMessageCount, messages.size());
@@ -103,15 +103,15 @@ public class AcknowledgeTest extends InternalBrokerBaseCase
         assertEquals("First message does not have expected deliveryTag", firstDeliveryTag, messages.get(0).getDeliveryTag());
 
         //Send required Acknowledgement
-        _channel.acknowledgeMessage(acknowledgeDeliveryTag, acknowldegeMultiple);
+        getChannel().acknowledgeMessage(acknowledgeDeliveryTag, acknowldegeMultiple);
 
-        if (_channel.isTransactional())
+        if (getChannel().isTransactional())
         {
-            _channel.commit();
+            getChannel().commit();
         }
 
         // Check Remaining Acknowledgements
-        assertEquals("Channel unacked msgs count incorrect", remainingUnackedMessages, _channel.getUnacknowledgedMessageMap().size());
+        assertEquals("Channel unacked msgs count incorrect", remainingUnackedMessages, getChannel().getUnacknowledgedMessageMap().size());
 
         //Check store contents are also correct.
         checkStoreContents(remainingUnackedMessages);
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java
index e3b07b072b..7fc3b2d06a 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java
@@ -40,12 +40,12 @@ public class TopicConfigurationTest extends InternalBrokerBaseCase
     @Override
     public void configure()
     {
-        _configXml.addProperty("virtualhosts.virtualhost.test.topics.topic.name", "stocks.nyse.appl");
+        getConfigXml().addProperty("virtualhosts.virtualhost.test.topics.topic.name", "stocks.nyse.appl");
 
-        _configXml.addProperty("virtualhosts.virtualhost.test.topics.topic(1).subscriptionName", getName()+":stockSubscription");
+        getConfigXml().addProperty("virtualhosts.virtualhost.test.topics.topic(1).subscriptionName", getName()+":stockSubscription");
 
-        _configXml.addProperty("virtualhosts.virtualhost.test.topics.topic(2).name", "stocks.nyse.orcl");
-        _configXml.addProperty("virtualhosts.virtualhost.test.topics.topic(2).subscriptionName", getName()+":stockSubscription");
+        getConfigXml().addProperty("virtualhosts.virtualhost.test.topics.topic(2).name", "stocks.nyse.orcl");
+        getConfigXml().addProperty("virtualhosts.virtualhost.test.topics.topic(2).subscriptionName", getName()+":stockSubscription");
    }
 
     /**
@@ -57,10 +57,10 @@ public class TopicConfigurationTest extends InternalBrokerBaseCase
      */
     public void testTopicCreation() throws ConfigurationException, AMQSecurityException, AMQInternalException
     {
-        Exchange topicExchange = _virtualHost.getExchangeRegistry().getExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME);
-        _virtualHost.getBindingFactory().addBinding("stocks.nyse.appl", _queue, topicExchange, null);
+        Exchange topicExchange = getVirtualHost().getExchangeRegistry().getExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME);
+        getVirtualHost().getBindingFactory().addBinding("stocks.nyse.appl", getQueue(), topicExchange, null);
 
-        TopicConfig config = _queue.getConfiguration().getConfiguration(TopicConfig.class.getName());
+        TopicConfig config = getQueue().getConfiguration().getConfiguration(TopicConfig.class.getName());
 
         assertNotNull("Queue should have topic configuration bound to it.", config);
         assertEquals("Configuration name not correct", "stocks.nyse.appl", config.getName());
@@ -77,15 +77,15 @@ public class TopicConfigurationTest extends InternalBrokerBaseCase
     {
 
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString(getName()+":stockSubscription"), false, new AMQShortString("testowner"),
-                                                    false, false, _virtualHost, null);
+                                                    false, false, getVirtualHost(), null);
 
-        _virtualHost.getQueueRegistry().registerQueue(queue);
-        Exchange defaultExchange = _virtualHost.getExchangeRegistry().getDefaultExchange();
-        _virtualHost.getBindingFactory().addBinding(getName(), queue, defaultExchange, null);
+        getVirtualHost().getQueueRegistry().registerQueue(queue);
+        Exchange defaultExchange = getVirtualHost().getExchangeRegistry().getDefaultExchange();
+        getVirtualHost().getBindingFactory().addBinding(getName(), queue, defaultExchange, null);
 
 
-        Exchange topicExchange = _virtualHost.getExchangeRegistry().getExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME);
-        _virtualHost.getBindingFactory().addBinding("stocks.nyse.orcl", queue, topicExchange, null);
+        Exchange topicExchange = getVirtualHost().getExchangeRegistry().getExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME);
+        getVirtualHost().getBindingFactory().addBinding("stocks.nyse.orcl", queue, topicExchange, null);
 
         TopicConfig config = queue.getConfiguration().getConfiguration(TopicConfig.class.getName());
 
@@ -107,15 +107,15 @@ public class TopicConfigurationTest extends InternalBrokerBaseCase
     {
 
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString(getName()+":stockSubscription"), false, new AMQShortString("testowner"),
-                                                    false, false, _virtualHost, null);
+                                                    false, false, getVirtualHost(), null);
 
-        _virtualHost.getQueueRegistry().registerQueue(queue);
-        Exchange defaultExchange = _virtualHost.getExchangeRegistry().getDefaultExchange();
-        _virtualHost.getBindingFactory().addBinding(getName(), queue, defaultExchange, null);
+        getVirtualHost().getQueueRegistry().registerQueue(queue);
+        Exchange defaultExchange = getVirtualHost().getExchangeRegistry().getDefaultExchange();
+        getVirtualHost().getBindingFactory().addBinding(getName(), queue, defaultExchange, null);
 
 
-        Exchange topicExchange = _virtualHost.getExchangeRegistry().getExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME);
-        _virtualHost.getBindingFactory().addBinding("stocks.nyse.ibm", queue, topicExchange, null);
+        Exchange topicExchange = getVirtualHost().getExchangeRegistry().getExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME);
+        getVirtualHost().getBindingFactory().addBinding("stocks.nyse.ibm", queue, topicExchange, null);
 
         TopicConfig config = queue.getConfiguration().getConfiguration(TopicConfig.class.getName());
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
index 2a542f2a0d..917755e8a5 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
@@ -20,8 +20,6 @@
 package org.apache.qpid.server.configuration;
 
 
-import org.apache.commons.configuration.XMLConfiguration;
-
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.queue.AMQPriorityQueue;
 import org.apache.qpid.server.queue.AMQQueue;
@@ -38,12 +36,12 @@ public class VirtualHostConfigurationTest extends InternalBrokerBaseCase
     {
         super.setUp();
         // Set the default configuration items
-        _configXml.clear();
-        _configXml.addProperty("virtualhosts.virtualhost(-1).name", "test");
-        _configXml.addProperty("virtualhosts.virtualhost(-1).test.store.class", TestableMemoryMessageStore.class.getName());
+        getConfigXml().clear();
+        getConfigXml().addProperty("virtualhosts.virtualhost(-1).name", "test");
+        getConfigXml().addProperty("virtualhosts.virtualhost(-1).test.store.class", TestableMemoryMessageStore.class.getName());
 
-        _configXml.addProperty("virtualhosts.virtualhost.name", getName());
-        _configXml.addProperty("virtualhosts.virtualhost."+getName()+".store.class", TestableMemoryMessageStore.class.getName());
+        getConfigXml().addProperty("virtualhosts.virtualhost.name", getName());
+        getConfigXml().addProperty("virtualhosts.virtualhost."+getName()+".store.class", TestableMemoryMessageStore.class.getName());
     }
 
     @Override
@@ -55,27 +53,27 @@ public class VirtualHostConfigurationTest extends InternalBrokerBaseCase
     public void testQueuePriority() throws Exception
     {
         // Set up queue with 5 priorities
-        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
                               "atest");
-        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.atest(-1).exchange",
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.atest(-1).exchange",
                               "amq.direct");
-        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.atest.priorities",
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.atest.priorities",
                               "5");
 
         // Set up queue with JMS style priorities
-        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
                               "ptest");
-        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ptest(-1).exchange",
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ptest(-1).exchange",
                               "amq.direct");
-        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ptest.priority",
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ptest.priority",
                                "true");
 
         // Set up queue with no priorities
-        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
                               "ntest");
-        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ntest(-1).exchange",
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ntest(-1).exchange",
                               "amq.direct");
-        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ntest.priority",
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ntest.priority",
                               "false");
 
         // Start the broker now.
@@ -102,18 +100,18 @@ public class VirtualHostConfigurationTest extends InternalBrokerBaseCase
     public void testQueueAlerts() throws Exception
     {
         // Set up queue with 5 priorities
-        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.exchange", "amq.topic");
-        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.maximumQueueDepth", "1");
-        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.maximumMessageSize", "2");
-        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.maximumMessageAge", "3");
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.exchange", "amq.topic");
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.maximumQueueDepth", "1");
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.maximumMessageSize", "2");
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.maximumMessageAge", "3");
 
-        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues(-1).queue(1).name(1)", "atest");
-        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).exchange", "amq.direct");
-        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumQueueDepth", "4");
-        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumMessageSize", "5");
-        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumMessageAge", "6");
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueueAlerts.queues(-1).queue(1).name(1)", "atest");
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).exchange", "amq.direct");
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumQueueDepth", "4");
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumMessageSize", "5");
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumMessageAge", "6");
 
-        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues(-1).queue(-1).name(-1)", "btest");
+        getConfigXml().addProperty("virtualhosts.virtualhost.testQueueAlerts.queues(-1).queue(-1).name(-1)", "btest");
 
         // Start the broker now.
         super.createBroker();
@@ -143,7 +141,7 @@ public class VirtualHostConfigurationTest extends InternalBrokerBaseCase
     {
         int initialPoolSize = 10;
 
-        _configXml.addProperty("virtualhosts.virtualhost.testHouseKeepingThreadCount.housekeeping.poolSize",
+        getConfigXml().addProperty("virtualhosts.virtualhost.testHouseKeepingThreadCount.housekeeping.poolSize",
                               initialPoolSize);
 
         // Start the broker now.
@@ -186,7 +184,7 @@ public class VirtualHostConfigurationTest extends InternalBrokerBaseCase
      {
          int initialPoolSize = 10;
 
-         _configXml.addProperty("virtualhosts.virtualhost.testDynamicHouseKeepingPoolSizeChange.housekeeping.poolSize",
+         getConfigXml().addProperty("virtualhosts.virtualhost.testDynamicHouseKeepingPoolSizeChange.housekeeping.poolSize",
                                initialPoolSize);
 
          // Start the broker now.
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 696e57e83f..7b58966a4c 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -383,11 +383,6 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
                     return false;  //To change body of implemented methods use File | Settings | File Templates.
                 }
 
-                public void setDeliveredToSubscription()
-                {
-                    //To change body of implemented methods use File | Settings | File Templates.
-                }
-
                 public void release()
                 {
                     //To change body of implemented methods use File | Settings | File Templates.
@@ -443,12 +438,7 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
                     return false;  //To change body of implemented methods use File | Settings | File Templates.
                 }
 
-                public void requeue()
-                {
-                    //To change body of implemented methods use File | Settings | File Templates.
-                }
-
-                public void requeue(Subscription subscription)
+                public void requeue(Subscription subscription) 
                 {
                     //To change body of implemented methods use File | Settings | File Templates.
                 }
@@ -463,11 +453,6 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
                     //To change body of implemented methods use File | Settings | File Templates.
                 }
 
-                public void restoreCredit()
-                {
-                    //To change body of implemented methods use File | Settings | File Templates.
-                }
-
                 public void discard()
                 {
                     //To change body of implemented methods use File | Settings | File Templates.
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
index c7727bfa1a..6346fff85f 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
@@ -24,8 +24,6 @@ import java.util.List;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.logging.LogSubject;
 
 /**
  * Test : AMQPChannelActorTest
@@ -56,7 +54,7 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
     {
         super.createBroker();
 
-        _amqpActor = new AMQPChannelActor(_channel, _rootLogger);
+        _amqpActor = new AMQPChannelActor(getChannel(), _rootLogger);
     }
 
 
@@ -69,7 +67,7 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
      */
     public void testChannel() throws Exception
     {
-        _configXml.setProperty("status-updates", "ON");
+        getConfigXml().setProperty("status-updates", "ON");
 
         startBrokerNow();
 
@@ -107,7 +105,7 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
      */
     public void testChannelLoggingOFF() throws Exception, AMQException
     {
-        _configXml.setProperty("status-updates", "OFF");
+        getConfigXml().setProperty("status-updates", "OFF");
 
         // Start the broker now.
         startBrokerNow();
@@ -128,7 +126,7 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
      */
     public void testChannelLoggingOfF() throws Exception, AMQException
     {
-        _configXml.setProperty("status-updates", "OfF");
+        getConfigXml().setProperty("status-updates", "OfF");
 
         startBrokerNow();
 
@@ -148,7 +146,7 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
      */
     public void testChannelLoggingOff() throws Exception, AMQException
     {
-        _configXml.setProperty("status-updates", "Off");
+        getConfigXml().setProperty("status-updates", "Off");
 
         startBrokerNow();
 
@@ -168,7 +166,7 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
      */
     public void testChannelLoggingofF() throws Exception, AMQException
     {
-        _configXml.setProperty("status-updates", "ofF");
+        getConfigXml().setProperty("status-updates", "ofF");
 
         startBrokerNow();
 
@@ -188,7 +186,7 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
      */
     public void testChannelLoggingoff() throws Exception, AMQException
     {
-        _configXml.setProperty("status-updates", "off");
+        getConfigXml().setProperty("status-updates", "off");
 
         startBrokerNow();
 
@@ -208,7 +206,7 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
      */
     public void testChannelLoggingoFf() throws Exception, AMQException
     {        
-        _configXml.setProperty("status-updates", "oFf");
+        getConfigXml().setProperty("status-updates", "oFf");
 
         startBrokerNow();
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
index 71d06f81ae..4eda9e9da1 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
@@ -20,11 +20,7 @@
  */
 package org.apache.qpid.server.logging.actors;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.server.configuration.ServerConfiguration;
 import org.apache.qpid.server.logging.LogMessage;
 import org.apache.qpid.server.logging.LogSubject;
 
@@ -64,7 +60,7 @@ public class AMQPConnectionActorTest extends BaseConnectionActorTestCase
      */
     public void testConnection() throws Exception
     {
-        _configXml.setProperty("status-updates", "ON");
+        getConfigXml().setProperty("status-updates", "ON");
 
         super.createBroker();
 
@@ -94,7 +90,7 @@ public class AMQPConnectionActorTest extends BaseConnectionActorTestCase
 
     public void testConnectionLoggingOff() throws Exception, AMQException
     {
-        _configXml.setProperty("status-updates", "OFF");
+        getConfigXml().setProperty("status-updates", "OFF");
 
         // Start the broker now.
         super.createBroker();
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
index 3d4ded5898..60ecbef438 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
@@ -38,7 +38,7 @@ public class BaseActorTestCase extends InternalBrokerBaseCase
     @Override
     public void configure()
     {
-        _configuration.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
+        getConfiguration().getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
     }
 
     @Override
@@ -46,7 +46,7 @@ public class BaseActorTestCase extends InternalBrokerBaseCase
     {
         super.createBroker();
 
-        _rawLogger = new UnitTestMessageLogger(_configuration);
+        _rawLogger = new UnitTestMessageLogger(getConfiguration());
         _rootLogger = _rawLogger;
     }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
index 1b95d53702..956d296dce 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
@@ -28,6 +28,6 @@ public class BaseConnectionActorTestCase extends BaseActorTestCase
     {
         super.createBroker();
 
-        _amqpActor = new AMQPConnectionActor(_session, _rootLogger);
+        _amqpActor = new AMQPConnectionActor(getSession(), _rootLogger);
     }
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
index 95a5610917..32ad1d110d 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
@@ -77,7 +77,7 @@ public class CurrentActorTest extends BaseConnectionActorTestCase
         // we remove the session actor and so all is good.
         stopBroker();
         
-        AMQPConnectionActor connectionActor = new AMQPConnectionActor(_session,
+        AMQPConnectionActor connectionActor = new AMQPConnectionActor(getSession(),
                                                                       new NullRootMessageLogger());
 
         /*
@@ -104,7 +104,7 @@ public class CurrentActorTest extends BaseConnectionActorTestCase
          *
          */
 
-        AMQChannel channel = new AMQChannel(_session, 1, _session.getVirtualHost().getMessageStore());
+        AMQChannel channel = new AMQChannel(getSession(), 1, getSession().getVirtualHost().getMessageStore());
 
         AMQPChannelActor channelActor = new AMQPChannelActor(channel,
                                                              new NullRootMessageLogger());
@@ -228,7 +228,7 @@ public class CurrentActorTest extends BaseConnectionActorTestCase
             try
             {
 
-                AMQPConnectionActor actor = new AMQPConnectionActor(_session,
+                AMQPConnectionActor actor = new AMQPConnectionActor(getSession(),
                                                                     new NullRootMessageLogger());
 
                 CurrentActor.set(actor);
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
index 8cb74ab29b..409f7c84b7 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
@@ -20,12 +20,6 @@
  */
 package org.apache.qpid.server.logging.actors;
 
-import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.queue.MockAMQQueue;
-import org.apache.qpid.AMQException;
-
 import java.util.List;
 
 public class QueueActorTest extends BaseConnectionActorTestCase
@@ -35,7 +29,7 @@ public class QueueActorTest extends BaseConnectionActorTestCase
     public void createBroker() throws Exception
     {
         super.createBroker();
-        _amqpActor = new QueueActor(_queue, _rootLogger);
+        _amqpActor = new QueueActor(getQueue(), _rootLogger);
     }
 
     /**
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
index d9246b13ec..a2272cc395 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
@@ -22,8 +22,6 @@ package org.apache.qpid.server.logging.actors;
 
 import java.util.List;
 
-import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.logging.LogSubject;
 import org.apache.qpid.server.subscription.MockSubscription;
 
 /**
@@ -45,7 +43,7 @@ public class SubscriptionActorTest extends BaseConnectionActorTestCase
 
         MockSubscription mockSubscription = new MockSubscription();
 
-        mockSubscription.setQueue(_queue, false);
+        mockSubscription.setQueue(getQueue(), false);
 
         _amqpActor = new SubscriptionActor(_rootLogger, mockSubscription);
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
index 025f899a6c..1cd8d55b0d 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
@@ -59,20 +59,12 @@ public abstract class AbstractTestLogSubject extends InternalBrokerBaseCase
     protected Configuration _config = new PropertiesConfiguration();
     protected LogSubject _subject = null;
 
-    AMQProtocolSession _session;
-
     @Override
     public void setUp() throws Exception
     {
         super.setUp();
 
         _config.setProperty(ServerConfiguration.STATUS_UPDATES, "ON");
-
-        VirtualHost virtualHost = ApplicationRegistry.getInstance().
-                getVirtualHostRegistry().getVirtualHosts().iterator().next();
-
-        // Create a single session for this test.
-        _session = new InternalTestProtocolSession(virtualHost);
     }
 
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
index 279628501c..e80c4c4679 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
@@ -33,10 +33,10 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
 public class BindingLogSubjectTest extends AbstractTestLogSubject
 {
 
-    AMQQueue _queue;
-    AMQShortString _routingKey;
-    Exchange _exchange;
-    VirtualHost _testVhost;
+    private AMQQueue _queue;
+    private AMQShortString _routingKey;
+    private Exchange _exchange;
+    private VirtualHost _testVhost;
 
     public void setUp() throws Exception
     {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
index 41760e1b05..6bc5effa05 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
@@ -34,7 +34,7 @@ public class ChannelLogSubjectTest extends ConnectionLogSubjectTest
     {
         super.setUp();
 
-        AMQChannel channel = new AMQChannel(_session, _channelID, _session.getVirtualHost().getMessageStore());
+        AMQChannel channel = new AMQChannel(getSession(), _channelID, getSession().getVirtualHost().getMessageStore());
 
         _subject = new ChannelLogSubject(channel);
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
index 92234e9241..c246fff2a8 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
@@ -30,7 +30,7 @@ public class ConnectionLogSubjectTest extends AbstractTestLogSubject
     {
         super.setUp();
 
-        _subject = new ConnectionLogSubject(_session);
+        _subject = new ConnectionLogSubject(getSession());
     }
 
     /**
@@ -40,7 +40,7 @@ public class ConnectionLogSubjectTest extends AbstractTestLogSubject
      */
     protected void validateLogStatement(String message)
     {
-        verifyConnection(_session.getSessionID(), "InternalTestProtocolSession", "127.0.0.1:1", "test", message);
+        verifyConnection(getSession().getSessionID(), "InternalTestProtocolSession", "127.0.0.1:1", "test", message);
     }
 
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
index 147ec2a275..1f432be57a 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
@@ -31,8 +31,8 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
 public class QueueLogSubjectTest extends AbstractTestLogSubject
 {
 
-    AMQQueue _queue;
-    VirtualHost _testVhost;
+    private AMQQueue _queue;
+    private VirtualHost _testVhost;
 
     @Override
     public void setUp() throws Exception
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
index e96dc47367..0c356e1838 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
@@ -37,10 +37,10 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
 public class SubscriptionLogSubjectTest extends AbstractTestLogSubject
 {
 
-    AMQQueue _queue;
-    VirtualHost _testVhost;
+    private AMQQueue _queue;
+    private VirtualHost _testVhost;
     private int _channelID = 1;
-    Subscription _subscription;
+    private Subscription _subscription;
 
     public void setUp() throws Exception
     {
@@ -52,13 +52,13 @@ public class SubscriptionLogSubjectTest extends AbstractTestLogSubject
         _queue = new MockAMQQueue("SubscriptionLogSubjectTest");
         ((MockAMQQueue) _queue).setVirtualHost(_testVhost);
 
-        AMQChannel channel = new AMQChannel(_session, _channelID, _session.getVirtualHost().getMessageStore());
+        AMQChannel channel = new AMQChannel(getSession(), _channelID, getSession().getVirtualHost().getMessageStore());
 
-        _session.addChannel(channel);
+        getSession().addChannel(channel);
 
         SubscriptionFactory factory = new SubscriptionFactoryImpl();
 
-        _subscription = factory.createSubscription(_channelID, _session, new AMQShortString("cTag"),
+        _subscription = factory.createSubscription(_channelID, getSession(), new AMQShortString("cTag"),
                                                    false, null, false,
                                                    new LimitlessCreditManager());
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
index dd1126992c..8c18ab85b0 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
@@ -34,13 +34,13 @@ public class PluginTest extends InternalBrokerBaseCase
     @Override
     public void configure()
     {
-        _configuration.getConfig().addProperty("plugin-directory", PLUGIN_DIRECTORY);
-        _configuration.getConfig().addProperty("cache-directory", CACHE_DIRECTORY);
+        getConfiguration().getConfig().addProperty("plugin-directory", PLUGIN_DIRECTORY);
+        getConfiguration().getConfig().addProperty("cache-directory", CACHE_DIRECTORY);
     }
 
     public void disabled_testLoadExchanges() throws Exception
     {
-        PluginManager manager = _registry.getPluginManager();
+        PluginManager manager = getRegistry().getPluginManager();
         Map<String, ExchangeType<?>> exchanges = manager.getExchanges();
         assertNotNull("No exchanges found in " + PLUGIN_DIRECTORY, exchanges);
         assertEquals("Wrong number of exchanges found in " + PLUGIN_DIRECTORY, 2, exchanges.size());
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
index 6af011f91d..0707cab3d5 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
@@ -55,14 +55,14 @@ public class AMQQueueAlertTest extends InternalBrokerBaseCase
      */
     public void testMessageCountAlert() throws Exception
     {
-        _session = new InternalTestProtocolSession(_virtualHost);
-        AMQChannel channel = new AMQChannel(_session, 2, _messageStore);
-        _session.addChannel(channel);
+        setSession(new InternalTestProtocolSession(getVirtualHost()));
+        AMQChannel channel = new AMQChannel(getSession(), 2, getMessageStore());
+        getSession().addChannel(channel);
 
-        _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue1"), false, new AMQShortString("AMQueueAlertTest"),
+        setQueue(AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue1"), false, new AMQShortString("AMQueueAlertTest"),
                               false, false,
-                              _virtualHost, null);
-        _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
+                getVirtualHost(), null));
+        _queueMBean = (AMQQueueMBean) getQueue().getManagedObject();
 
         _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
 
@@ -83,14 +83,14 @@ public class AMQQueueAlertTest extends InternalBrokerBaseCase
      */
     public void testMessageSizeAlert() throws Exception
     {
-        _session = new InternalTestProtocolSession(_virtualHost);
-        AMQChannel channel = new AMQChannel(_session, 2, _messageStore);
-        _session.addChannel(channel);
+        setSession(new InternalTestProtocolSession(getVirtualHost()));
+        AMQChannel channel = new AMQChannel(getSession(), 2, getMessageStore());
+        getSession().addChannel(channel);
 
-        _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue2"), false, new AMQShortString("AMQueueAlertTest"),
+        setQueue(AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue2"), false, new AMQShortString("AMQueueAlertTest"),
                               false, false,
-                              _virtualHost, null);
-        _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
+                getVirtualHost(), null));
+        _queueMBean = (AMQQueueMBean) getQueue().getManagedObject();
         _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
         _queueMBean.setMaximumMessageSize(MAX_MESSAGE_SIZE);
 
@@ -113,18 +113,18 @@ public class AMQQueueAlertTest extends InternalBrokerBaseCase
      */
     public void testQueueDepthAlertNoSubscriber() throws Exception
     {
-        _session = new InternalTestProtocolSession(_virtualHost);
-        AMQChannel channel = new AMQChannel(_session, 2, _messageStore);
-        _session.addChannel(channel);
+        setSession(new InternalTestProtocolSession(getVirtualHost()));
+        AMQChannel channel = new AMQChannel(getSession(), 2, getMessageStore());
+        getSession().addChannel(channel);
 
-        _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue3"), false, new AMQShortString("AMQueueAlertTest"),
+        setQueue(AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue3"), false, new AMQShortString("AMQueueAlertTest"),
                               false, false,
-                              _virtualHost, null);
-        _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
+                getVirtualHost(), null));
+        _queueMBean = (AMQQueueMBean) getQueue().getManagedObject();
         _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
         _queueMBean.setMaximumQueueDepth(MAX_QUEUE_DEPTH);
 
-        while (_queue.getQueueDepth() < MAX_QUEUE_DEPTH)
+        while (getQueue().getQueueDepth() < MAX_QUEUE_DEPTH)
         {
             sendMessages(channel, 1, MAX_MESSAGE_SIZE);
         }
@@ -146,14 +146,14 @@ public class AMQQueueAlertTest extends InternalBrokerBaseCase
      */
     public void testMessageAgeAlert() throws Exception
     {
-        _session = new InternalTestProtocolSession(_virtualHost);
-        AMQChannel channel = new AMQChannel(_session, 2, _messageStore);
-        _session.addChannel(channel);
+        setSession(new InternalTestProtocolSession(getVirtualHost()));
+        AMQChannel channel = new AMQChannel(getSession(), 2, getMessageStore());
+        getSession().addChannel(channel);
 
-        _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue4"), false, new AMQShortString("AMQueueAlertTest"),
+        setQueue(AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue4"), false, new AMQShortString("AMQueueAlertTest"),
                               false, false,
-                              _virtualHost, null);
-        _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
+                getVirtualHost(), null));
+        _queueMBean = (AMQQueueMBean) getQueue().getManagedObject();
         _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
         _queueMBean.setMaximumMessageAge(MAX_MESSAGE_AGE);
 
@@ -179,18 +179,18 @@ public class AMQQueueAlertTest extends InternalBrokerBaseCase
     */
     public void testQueueDepthAlertWithSubscribers() throws Exception
     {
-        AMQChannel channel = new AMQChannel(_session, 2, _messageStore);
-        _session.addChannel(channel);
+        AMQChannel channel = new AMQChannel(getSession(), 2, getMessageStore());
+        getSession().addChannel(channel);
 
         // Create queue
-        _queue = getNewQueue();
+        setQueue(getNewQueue());
         Subscription subscription =
-                SUBSCRIPTION_FACTORY.createSubscription(channel.getChannelId(), _session, new AMQShortString("consumer_tag"), true, null, false, channel.getCreditManager());
+                SUBSCRIPTION_FACTORY.createSubscription(channel.getChannelId(), getSession(), new AMQShortString("consumer_tag"), true, null, false, channel.getCreditManager());
 
-        _queue.registerSubscription(
+        getQueue().registerSubscription(
                 subscription, false);
 
-        _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
+        _queueMBean = (AMQQueueMBean) getQueue().getManagedObject();
         _queueMBean.setMaximumMessageCount(9999l);   // Set a high value, because this is not being tested
         _queueMBean.setMaximumQueueDepth(MAX_QUEUE_DEPTH);
 
@@ -207,7 +207,7 @@ public class AMQQueueAlertTest extends InternalBrokerBaseCase
 
         // Kill the subscriber and check for the queue depth values.
         // Messages are unacknowledged, so those should get requeued. All messages should be on the Queue
-        _queue.unregisterSubscription(subscription);
+        getQueue().unregisterSubscription(subscription);
         channel.requeue();
 
         assertEquals(new Long(totalSize), new Long(_queueMBean.getQueueDepth()));
@@ -220,12 +220,12 @@ public class AMQQueueAlertTest extends InternalBrokerBaseCase
         // Connect a consumer again and check QueueDepth values. The queue should get emptied.
         // Messages will get delivered but still are unacknowledged.
         Subscription subscription2 =
-                SUBSCRIPTION_FACTORY.createSubscription(channel.getChannelId(), _session, new AMQShortString("consumer_tag"), true, null, false, channel.getCreditManager());
+                SUBSCRIPTION_FACTORY.createSubscription(channel.getChannelId(), getSession(), new AMQShortString("consumer_tag"), true, null, false, channel.getCreditManager());
 
-        _queue.registerSubscription(
+        getQueue().registerSubscription(
                 subscription2, false);
 
-        while (_queue.getUndeliveredMessageCount()!= 0)
+        while (getQueue().getUndeliveredMessageCount()!= 0)
         {
             Thread.sleep(100);
         }
@@ -233,11 +233,11 @@ public class AMQQueueAlertTest extends InternalBrokerBaseCase
 
         // Kill the subscriber again. Now those messages should get requeued again. Check if the queue depth
         // value is correct.
-        _queue.unregisterSubscription(subscription2);
+        getQueue().unregisterSubscription(subscription2);
         channel.requeue();
 
         assertEquals(new Long(totalSize), new Long(_queueMBean.getQueueDepth()));
-        _session.closeSession();
+        getSession().closeSession();
 
         // Check the clear queue
         _queueMBean.clearQueue();
@@ -289,7 +289,7 @@ public class AMQQueueAlertTest extends InternalBrokerBaseCase
     protected void configure()
     {
         // Increase Alert Check period
-        _configuration.setHousekeepingExpiredMessageCheckPeriod(200);
+        getConfiguration().setHousekeepingExpiredMessageCheckPeriod(200);
     }
 
     private void sendMessages(AMQChannel channel, long messageCount, final long size) throws AMQException
@@ -300,9 +300,9 @@ public class AMQQueueAlertTest extends InternalBrokerBaseCase
         {
             messages[i] = message(false, size);
             ArrayList<AMQQueue> qs = new ArrayList<AMQQueue>();
-            qs.add(_queue);
+            qs.add(getQueue());
             metaData[i] = messages[i].headersReceived();
-            messages[i].setStoredMessage(_messageStore.addMessage(metaData[i]));
+            messages[i].setStoredMessage(getMessageStore().addMessage(metaData[i]));
 
             messages[i].enqueue(qs);
 
@@ -334,7 +334,7 @@ public class AMQQueueAlertTest extends InternalBrokerBaseCase
                 }
             });
 
-            _queue.enqueue(new AMQMessage(messages[i].getStoredMessage()));
+            getQueue().enqueue(new AMQMessage(messages[i].getStoredMessage()));
 
         }
     }
@@ -345,6 +345,6 @@ public class AMQQueueAlertTest extends InternalBrokerBaseCase
                             false,
                             new AMQShortString("AMQueueAlertTest"),
                             false,
-                            false, _virtualHost, null);
+                            false, getVirtualHost(), null);
     }
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
index 3735ef123d..5b72cfac40 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
@@ -34,7 +34,6 @@ import org.apache.qpid.server.message.MessageMetaData;
 import org.apache.qpid.server.subscription.Subscription;
 import org.apache.qpid.server.subscription.SubscriptionFactory;
 import org.apache.qpid.server.subscription.SubscriptionFactoryImpl;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
 import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.store.TestableMemoryMessageStore;
@@ -145,7 +144,7 @@ public class AMQQueueMBeanTest extends InternalBrokerBaseCase
     private void verifyBrokerState()
     {
 
-        TestableMemoryMessageStore store = (TestableMemoryMessageStore)_virtualHost.getMessageStore();
+        TestableMemoryMessageStore store = (TestableMemoryMessageStore) getVirtualHost().getMessageStore();
 
         // Unlike MessageReturnTest there is no need for a delay as there this thread does the clean up.
 
@@ -155,19 +154,19 @@ public class AMQQueueMBeanTest extends InternalBrokerBaseCase
     public void testConsumerCount() throws AMQException
     {
 
-        assertTrue(_queue.getActiveConsumerCount() == 0);
+        assertTrue(getQueue().getActiveConsumerCount() == 0);
         assertTrue(_queueMBean.getActiveConsumerCount() == 0);
 
 
-        InternalTestProtocolSession protocolSession = new InternalTestProtocolSession(_virtualHost);
+        InternalTestProtocolSession protocolSession = new InternalTestProtocolSession(getVirtualHost());
 
-        AMQChannel channel = new AMQChannel(protocolSession, 1, _messageStore);
+        AMQChannel channel = new AMQChannel(protocolSession, 1, getMessageStore());
         protocolSession.addChannel(channel);
 
         Subscription subscription =
                 SUBSCRIPTION_FACTORY.createSubscription(channel.getChannelId(), protocolSession, new AMQShortString("test"), false, null, false, channel.getCreditManager());
 
-        _queue.registerSubscription(subscription, false);
+        getQueue().registerSubscription(subscription, false);
         assertEquals(1,(int)_queueMBean.getActiveConsumerCount());
 
 
@@ -187,8 +186,8 @@ public class AMQQueueMBeanTest extends InternalBrokerBaseCase
                                                                  null,
                                                                  true,
                 channel.getCreditManager());
-        _queue.registerSubscription(s1,false);
-        _queue.registerSubscription(s2,false);
+        getQueue().registerSubscription(s1,false);
+        getQueue().registerSubscription(s2,false);
         assertTrue(_queueMBean.getActiveConsumerCount() == 3);
         assertTrue(_queueMBean.getConsumerCount() == 3);
 
@@ -215,10 +214,10 @@ public class AMQQueueMBeanTest extends InternalBrokerBaseCase
         //set+get exclusivity using the mbean, and also verify it is actually updated in the queue
         _queueMBean.setExclusive(true);
         assertTrue("Exclusive property should be true.",_queueMBean.isExclusive());
-        assertTrue("Exclusive property should be true.",_queue.isExclusive());
+        assertTrue("Exclusive property should be true.", getQueue().isExclusive());
         _queueMBean.setExclusive(false);
         assertFalse("Exclusive property should be false.",_queueMBean.isExclusive());
-        assertFalse("Exclusive property should be false.",_queue.isExclusive());
+        assertFalse("Exclusive property should be false.", getQueue().isExclusive());
     }
 
     public void testExceptions() throws Exception
@@ -266,12 +265,12 @@ public class AMQQueueMBeanTest extends InternalBrokerBaseCase
         }
 
         IncomingMessage msg = message(false, false);
-        _queue.clearQueue();
+        getQueue().clearQueue();
         ArrayList<AMQQueue> qs = new ArrayList<AMQQueue>();
-        qs.add(_queue);
+        qs.add(getQueue());
         msg.enqueue(qs);
         MessageMetaData mmd = msg.headersReceived();
-        msg.setStoredMessage(_messageStore.addMessage(mmd));
+        msg.setStoredMessage(getMessageStore().addMessage(mmd));
         long id = msg.getMessageNumber();
 
         msg.addContentBodyFrame(new ContentChunk()
@@ -356,8 +355,8 @@ public class AMQQueueMBeanTest extends InternalBrokerBaseCase
         }
         
         //create a channel and use it to exercise the capacity check mechanism
-        AMQChannel channel = new AMQChannel(_session, 1, _messageStore);
-        _queue.checkCapacity(channel);
+        AMQChannel channel = new AMQChannel(getSession(), 1, getMessageStore());
+        getQueue().checkCapacity(channel);
         
         assertTrue(_queueMBean.isFlowOverfull());
         assertTrue(channel.getBlocking());
@@ -416,7 +415,7 @@ public class AMQQueueMBeanTest extends InternalBrokerBaseCase
     {
         super.setUp();
 
-        _queueMBean = new AMQQueueMBean(_queue);
+        _queueMBean = new AMQQueueMBean(getQueue());
     }
 
     public void tearDown()
@@ -430,16 +429,16 @@ public class AMQQueueMBeanTest extends InternalBrokerBaseCase
         {
             IncomingMessage currentMessage = message(false, persistent);
             ArrayList<AMQQueue> qs = new ArrayList<AMQQueue>();
-            qs.add(_queue);
+            qs.add(getQueue());
             currentMessage.enqueue(qs);
 
             // route header
             MessageMetaData mmd = currentMessage.headersReceived();
-            currentMessage.setStoredMessage(_messageStore.addMessage(mmd));
+            currentMessage.setStoredMessage(getMessageStore().addMessage(mmd));
 
             // Add the body so we have somthing to test later
             currentMessage.addContentBodyFrame(
-                    _session.getMethodRegistry()
+                    getSession().getMethodRegistry()
                                                        .getProtocolVersionMethodConverter()
                                                        .convertToContentChunk(
                                                        new ContentBody(ByteBuffer.allocate((int) MESSAGE_SIZE),
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
index b0a655e8b6..9b65b7750c 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
@@ -236,7 +236,6 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
            ex = e;
         }
         assertNotNull(ex);
-        assertTrue(ex instanceof AMQException);
 
         // Check we cannot add an exclusive subscriber to a queue with an
         // existing subscription
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
index 512efca9bc..e45c8d7b96 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
@@ -84,7 +84,7 @@ public class ApplicationRegistryShutdownTest extends InternalBrokerBaseCase
         assertTrue("No new SASL mechanisms added by initialisation.", additions.size() != 0 );
 
         //Close the registry which will perform the close the AuthenticationManager
-        _registry.close();
+        getRegistry().close();
 
         //Validate that the SASL plugFins have been removed.
         Provider[] providersAfterClose = Security.getProviders();
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreShutdownTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreShutdownTest.java
index a695a67eea..6ca88d1796 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreShutdownTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreShutdownTest.java
@@ -32,11 +32,11 @@ public class MessageStoreShutdownTest extends InternalBrokerBaseCase
 
     public void test()
     {
-        subscribe(_session, _channel, _queue);
+        subscribe(getSession(), getChannel(), getQueue());
 
         try
         {
-            publishMessages(_session, _channel, 1);
+            publishMessages(getSession(), getChannel(), 1);
         }
         catch (AMQException e)
         {
@@ -46,7 +46,7 @@ public class MessageStoreShutdownTest extends InternalBrokerBaseCase
 
         try
         {
-            _registry.close();
+            getRegistry().close();
         }
         catch (Exception e)
         {
@@ -54,7 +54,7 @@ public class MessageStoreShutdownTest extends InternalBrokerBaseCase
             fail(e.getMessage());
         }
 
-        assertTrue("Session should now be closed", _session.isClosed());
+        assertTrue("Session should now be closed", getSession().isClosed());
 
 
         //Test attempting to modify the broker state after session has been closed.
@@ -62,14 +62,14 @@ public class MessageStoreShutdownTest extends InternalBrokerBaseCase
         //The Message should have been removed from the unacked list.
 
         //Ack Messages
-        List<InternalTestProtocolSession.DeliveryPair> list = _session.getDelivers(_channel.getChannelId(), new AMQShortString("sgen_1"), 1);
+        List<InternalTestProtocolSession.DeliveryPair> list = getSession().getDelivers(getChannel().getChannelId(), new AMQShortString("sgen_1"), 1);
 
         InternalTestProtocolSession.DeliveryPair pair = list.get(0);
 
         try
         {
             // The message should now be requeued and so unable to ack it.
-            _channel.acknowledgeMessage(pair.getDeliveryTag(), false);
+            getChannel().acknowledgeMessage(pair.getDeliveryTag(), false);
         }
         catch (AMQException e)
         {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
index 9cc9148c55..3ebe631f62 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -110,15 +110,15 @@ public class MessageStoreTest extends InternalBrokerBaseCase
 
     protected void reloadVirtualHost()
     {
-        VirtualHost original = _virtualHost;
+        VirtualHost original = getVirtualHost();
 
-        if (_virtualHost != null)
+        if (getVirtualHost() != null)
         {
             try
             {
-                _virtualHost.close();
-                _virtualHost.getApplicationRegistry().
-                getVirtualHostRegistry().unregisterVirtualHost(_virtualHost);
+                getVirtualHost().close();
+                getVirtualHost().getApplicationRegistry().
+                getVirtualHostRegistry().unregisterVirtualHost(getVirtualHost());
             }
             catch (Exception e)
             {
@@ -128,7 +128,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
 
         try
         {
-            _virtualHost = ApplicationRegistry.getInstance().createVirtualHost(new VirtualHostConfiguration(getClass().getName(), _config));
+            setVirtualHost(ApplicationRegistry.getInstance().createVirtualHost(new VirtualHostConfiguration(getClass().getName(), _config)));
         }
         catch (Exception e)
         {
@@ -136,7 +136,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
             fail(e.getMessage());
         }
 
-        assertTrue("Virtualhost has not changed, reload was not successful", original != _virtualHost);
+        assertTrue("Virtualhost has not changed, reload was not successful", original != getVirtualHost());
     }
 
     /**
@@ -145,7 +145,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
      */
     public void testQueueExchangeAndBindingCreation() throws Exception
     {
-        assertEquals("Should not be any existing queues", 0,  _virtualHost.getQueueRegistry().getQueues().size());
+        assertEquals("Should not be any existing queues", 0,  getVirtualHost().getQueueRegistry().getQueues().size());
 
         createAllQueues();
         createAllTopicQueues();
@@ -183,7 +183,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
         validateMessageOnTopics(2, true);
 
         assertEquals("Not all queues correctly registered",
-                10, _virtualHost.getQueueRegistry().getQueues().size());
+                10, getVirtualHost().getQueueRegistry().getQueues().size());
     }
 
     /**
@@ -212,7 +212,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
     {
         testMessagePersistence();
 
-        QueueRegistry queueRegistry = _virtualHost.getQueueRegistry();
+        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
 
         assertEquals("Incorrect number of queues registered after recovery", 
                 6,  queueRegistry.getQueues().size());
@@ -237,7 +237,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
     public void testQueuePersistence() throws Exception
     {
         assertEquals("Should not be any existing queues",
-                0, _virtualHost.getQueueRegistry().getQueues().size());
+                0, getVirtualHost().getQueueRegistry().getQueues().size());
 
         //create durable and non durable queues/topics
         createAllQueues();
@@ -246,7 +246,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
         //reload the virtual host, prompting recovery of the queues/topics
         reloadVirtualHost();
 
-        QueueRegistry queueRegistry = _virtualHost.getQueueRegistry();
+        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
 
         assertEquals("Incorrect number of queues registered after recovery", 
                 6,  queueRegistry.getQueues().size());
@@ -285,22 +285,22 @@ public class MessageStoreTest extends InternalBrokerBaseCase
         //Register Durable Queue
         createQueue(durableQueueName, false, true, false, false);
 
-        QueueRegistry queueRegistry = _virtualHost.getQueueRegistry();
+        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
         assertEquals("Incorrect number of queues registered before recovery",
                 1,  queueRegistry.getQueues().size());
 
         reloadVirtualHost();
         
-        queueRegistry = _virtualHost.getQueueRegistry();
+        queueRegistry = getVirtualHost().getQueueRegistry();
         assertEquals("Incorrect number of queues registered after first recovery",
                 1,  queueRegistry.getQueues().size());
         
         //test that removing the queue means it is not recovered next time
-        _virtualHost.getDurableConfigurationStore().removeQueue(queueRegistry.getQueue(durableQueueName));
+        getVirtualHost().getDurableConfigurationStore().removeQueue(queueRegistry.getQueue(durableQueueName));
 
         reloadVirtualHost();
         
-        queueRegistry = _virtualHost.getQueueRegistry();
+        queueRegistry = getVirtualHost().getQueueRegistry();
         assertEquals("Incorrect number of queues registered after second recovery",
                 0,  queueRegistry.getQueues().size());
         assertNull("Durable queue was not removed:" + durableQueueName, 
@@ -314,12 +314,12 @@ public class MessageStoreTest extends InternalBrokerBaseCase
      */
     public void testExchangePersistence() throws Exception
     {
-        int origExchangeCount = _virtualHost.getExchangeRegistry().getExchangeNames().size();
+        int origExchangeCount = getVirtualHost().getExchangeRegistry().getExchangeNames().size();
 
         Map<AMQShortString, Exchange> oldExchanges = createExchanges();
 
         assertEquals("Incorrect number of exchanges registered before recovery", 
-                origExchangeCount + 3, _virtualHost.getExchangeRegistry().getExchangeNames().size());
+                origExchangeCount + 3, getVirtualHost().getExchangeRegistry().getExchangeNames().size());
 
         reloadVirtualHost();
 
@@ -334,26 +334,26 @@ public class MessageStoreTest extends InternalBrokerBaseCase
      */
     public void testDurableExchangeRemoval() throws Exception
     {
-        int origExchangeCount = _virtualHost.getExchangeRegistry().getExchangeNames().size();
+        int origExchangeCount = getVirtualHost().getExchangeRegistry().getExchangeNames().size();
 
         createExchange(DirectExchange.TYPE, directExchangeName, true);
        
-        ExchangeRegistry exchangeRegistry = _virtualHost.getExchangeRegistry();
+        ExchangeRegistry exchangeRegistry = getVirtualHost().getExchangeRegistry();
         assertEquals("Incorrect number of exchanges registered before recovery", 
                 origExchangeCount + 1,  exchangeRegistry.getExchangeNames().size());
 
         reloadVirtualHost();
         
-        exchangeRegistry = _virtualHost.getExchangeRegistry();
+        exchangeRegistry = getVirtualHost().getExchangeRegistry();
         assertEquals("Incorrect number of exchanges registered after first recovery", 
                 origExchangeCount + 1,  exchangeRegistry.getExchangeNames().size());
         
         //test that removing the exchange means it is not recovered next time
-        _virtualHost.getDurableConfigurationStore().removeExchange(exchangeRegistry.getExchange(directExchangeName));
+        getVirtualHost().getDurableConfigurationStore().removeExchange(exchangeRegistry.getExchange(directExchangeName));
 
         reloadVirtualHost();
         
-        exchangeRegistry = _virtualHost.getExchangeRegistry();
+        exchangeRegistry = getVirtualHost().getExchangeRegistry();
         assertEquals("Incorrect number of exchanges registered after second recovery", 
                 origExchangeCount,  exchangeRegistry.getExchangeNames().size());
         assertNull("Durable exchange was not removed:" + directExchangeName, 
@@ -368,7 +368,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
      */
     public void testBindingPersistence() throws Exception
     {
-        int origExchangeCount = _virtualHost.getExchangeRegistry().getExchangeNames().size();
+        int origExchangeCount = getVirtualHost().getExchangeRegistry().getExchangeNames().size();
 
         createAllQueues();
         createAllTopicQueues();
@@ -384,7 +384,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
         bindAllTopicQueuesToExchange(topicExchange, topicRouting);
 
         assertEquals("Incorrect number of exchanges registered before recovery", 
-                origExchangeCount + 3, _virtualHost.getExchangeRegistry().getExchangeNames().size());
+                origExchangeCount + 3, getVirtualHost().getExchangeRegistry().getExchangeNames().size());
 
         reloadVirtualHost();
 
@@ -400,7 +400,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
      */
     public void testDurableBindingRemoval() throws Exception
     {
-        QueueRegistry queueRegistry = _virtualHost.getQueueRegistry();
+        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
 
         //create durable queue and exchange, bind them
         Exchange exch = createExchange(DirectExchange.TYPE, directExchangeName, true);
@@ -413,11 +413,11 @@ public class MessageStoreTest extends InternalBrokerBaseCase
         //verify binding is actually normally recovered
         reloadVirtualHost();
 
-        queueRegistry = _virtualHost.getQueueRegistry();
+        queueRegistry = getVirtualHost().getQueueRegistry();
         assertEquals("Incorrect number of bindings registered after first recovery", 
                 1, queueRegistry.getQueue(durableQueueName).getBindings().size());
 
-        ExchangeRegistry exchangeRegistry = _virtualHost.getExchangeRegistry();
+        ExchangeRegistry exchangeRegistry = getVirtualHost().getExchangeRegistry();
         exch = exchangeRegistry.getExchange(directExchangeName);
         assertNotNull("Exchange was not recovered", exch);
 
@@ -426,7 +426,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
 
         reloadVirtualHost();
 
-        queueRegistry = _virtualHost.getQueueRegistry();
+        queueRegistry = getVirtualHost().getQueueRegistry();
         assertEquals("Incorrect number of bindings registered after second recovery", 
                 0, queueRegistry.getQueue(durableQueueName).getBindings().size());
     }
@@ -438,7 +438,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
      */
     private void validateExchanges(int originalNumExchanges, Map<AMQShortString, Exchange> oldExchanges)
     {
-        ExchangeRegistry registry = _virtualHost.getExchangeRegistry();
+        ExchangeRegistry registry = getVirtualHost().getExchangeRegistry();
 
         assertTrue(directExchangeName + " exchange NOT reloaded",
                 registry.getExchangeNames().contains(directExchangeName));
@@ -461,7 +461,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
     /** Validates the Durable queues and their properties are as expected following recovery */
     private void validateBindingProperties()
     {
-        QueueRegistry queueRegistry = _virtualHost.getQueueRegistry();
+        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
 
         assertEquals("Incorrect number of (durable) queues following recovery", 6, queueRegistry.getQueues().size());
 
@@ -497,7 +497,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
 
     private void setQueueExclusivity(boolean exclusive) throws AMQException
     {
-        QueueRegistry queueRegistry = _virtualHost.getQueueRegistry();
+        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
 
         AMQQueue queue = queueRegistry.getQueue(durableExclusiveQueueName);
 
@@ -506,7 +506,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
 
     private void validateQueueExclusivityProperty(boolean expected)
     {
-        QueueRegistry queueRegistry = _virtualHost.getQueueRegistry();
+        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
 
         AMQQueue queue = queueRegistry.getQueue(durableExclusiveQueueName);
 
@@ -516,7 +516,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
 
     private void validateDurableQueueProperties()
     {
-        QueueRegistry queueRegistry = _virtualHost.getQueueRegistry();
+        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
 
         validateQueueProperties(queueRegistry.getQueue(durablePriorityQueueName), true, true, false, false);
         validateQueueProperties(queueRegistry.getQueue(durablePriorityTopicQueueName), true, true, false, false);
@@ -603,7 +603,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
         currentMessage.setExpiration();
 
         MessageMetaData mmd = currentMessage.headersReceived();
-        currentMessage.setStoredMessage(_virtualHost.getMessageStore().addMessage(mmd));
+        currentMessage.setStoredMessage(getVirtualHost().getMessageStore().addMessage(mmd));
         currentMessage.getStoredMessage().flushToStore();
         currentMessage.route();
 
@@ -611,7 +611,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
         // check and deliver if header says body length is zero
         if (currentMessage.allContentReceived())
         {
-            ServerTransaction trans = new AutoCommitTransaction(_virtualHost.getMessageStore());
+            ServerTransaction trans = new AutoCommitTransaction(getVirtualHost().getMessageStore());
             final List<? extends BaseQueue> destinationQueues = currentMessage.getDestinationQueues();
             trans.enqueue(currentMessage.getDestinationQueues(), currentMessage, new ServerTransaction.Action() {
                 public void postCommit()
@@ -703,13 +703,13 @@ public class MessageStoreTest extends InternalBrokerBaseCase
         try
         {
             queue = AMQQueueFactory.createAMQQueueImpl(queueName, durable, queueOwner, false, exclusive,
-                    _virtualHost, queueArguments);
+                    getVirtualHost(), queueArguments);
 
             validateQueueProperties(queue, usePriority, durable, exclusive, lastValueQueue);
 
             if (queue.isDurable() && !queue.isAutoDelete())
             {
-                _virtualHost.getMessageStore().createQueue(queue, queueArguments);
+                getVirtualHost().getMessageStore().createQueue(queue, queueArguments);
             }
         }
         catch (AMQException e)
@@ -717,7 +717,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
             fail(e.getMessage());
         }
 
-        _virtualHost.getQueueRegistry().registerQueue(queue);
+        getVirtualHost().getQueueRegistry().registerQueue(queue);
 
     }
 
@@ -741,7 +741,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
 
         try
         {
-            exchange = type.newInstance(_virtualHost, name, durable, 0, false);
+            exchange = type.newInstance(getVirtualHost(), name, durable, 0, false);
         }
         catch (AMQException e)
         {
@@ -750,10 +750,10 @@ public class MessageStoreTest extends InternalBrokerBaseCase
 
         try
         {
-            _virtualHost.getExchangeRegistry().registerExchange(exchange);
+            getVirtualHost().getExchangeRegistry().registerExchange(exchange);
             if (durable)
             {
-                _virtualHost.getMessageStore().createExchange(exchange);
+                getVirtualHost().getMessageStore().createExchange(exchange);
             }
         }
         catch (AMQException e)
@@ -768,7 +768,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
         FieldTable queueArguments = new FieldTable();
         queueArguments.put(AMQQueueFactory.X_QPID_PRIORITIES, DEFAULT_PRIORTY_LEVEL);
 
-        QueueRegistry queueRegistry = _virtualHost.getQueueRegistry();
+        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
 
         bindQueueToExchange(exchange, routingKey, queueRegistry.getQueue(durablePriorityQueueName), false, queueArguments);
         bindQueueToExchange(exchange, routingKey, queueRegistry.getQueue(durableQueueName), false, null);
@@ -782,7 +782,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
         FieldTable queueArguments = new FieldTable();
         queueArguments.put(AMQQueueFactory.X_QPID_PRIORITIES, DEFAULT_PRIORTY_LEVEL);
 
-        QueueRegistry queueRegistry = _virtualHost.getQueueRegistry();
+        QueueRegistry queueRegistry = getVirtualHost().getQueueRegistry();
 
         bindQueueToExchange(exchange, routingKey, queueRegistry.getQueue(durablePriorityTopicQueueName), true, queueArguments);
         bindQueueToExchange(exchange, routingKey, queueRegistry.getQueue(durableTopicQueueName), true, null);
@@ -803,7 +803,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
 
         try
         {
-            _virtualHost.getBindingFactory().addBinding(String.valueOf(routingKey), queue, exchange, FieldTable.convertToMap(bindArguments));
+            getVirtualHost().getBindingFactory().addBinding(String.valueOf(routingKey), queue, exchange, FieldTable.convertToMap(bindArguments));
         }
         catch (Exception e)
         {
@@ -823,7 +823,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
 
         try
         {
-            _virtualHost.getBindingFactory().removeBinding(String.valueOf(routingKey), queue, exchange, FieldTable.convertToMap(bindArguments));
+            getVirtualHost().getBindingFactory().removeBinding(String.valueOf(routingKey), queue, exchange, FieldTable.convertToMap(bindArguments));
         }
         catch (Exception e)
         {
@@ -857,7 +857,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
 
     private void validateMessageOnQueue(AMQShortString queueName, long messageCount)
     {
-        AMQQueue queue = _virtualHost.getQueueRegistry().getQueue(queueName);
+        AMQQueue queue = getVirtualHost().getQueueRegistry().getQueue(queueName);
 
         assertNotNull("Queue(" + queueName + ") not correctly registered:", queue);
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
index d0db4ebd38..b315a79b33 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
@@ -39,29 +39,29 @@ public class QueueBrowserUsesNoAckTest extends InternalBrokerBaseCase
         checkStoreContents(0);
 
         //Send required messsages to the queue
-        publishMessages(_session, _channel, sendMessageCount);
+        publishMessages(getSession(), getChannel(), sendMessageCount);
 
         //Ensure they are stored
         checkStoreContents(sendMessageCount);
 
         //Check that there are no unacked messages
         assertEquals("Channel should have no unacked msgs ", 0,
-                     _channel.getUnacknowledgedMessageMap().size());
+                     getChannel().getUnacknowledgedMessageMap().size());
 
         //Set the prefetch on the session to be less than the sent messages
-        _channel.setCredit(0, prefetch);
+        getChannel().setCredit(0, prefetch);
 
         //browse the queue
-        AMQShortString browser = browse(_channel, _queue);
+        AMQShortString browser = browse(getChannel(), getQueue());
 
-        _queue.deliverAsync();
+        getQueue().deliverAsync();
 
         //Wait for messages to fill the prefetch
-        _session.awaitDelivery(prefetch);
+        getSession().awaitDelivery(prefetch);
 
         //Get those messages
         List<InternalTestProtocolSession.DeliveryPair> messages =
-                _session.getDelivers(_channel.getChannelId(), browser,
+                getSession().getDelivers(getChannel().getChannelId(), browser,
                                      prefetch);
 
         //Ensure we recevied the prefetched messages
@@ -70,7 +70,7 @@ public class QueueBrowserUsesNoAckTest extends InternalBrokerBaseCase
         //Check the process didn't suspend the subscription as this would
         // indicate we are using the prefetch credit. i.e. using acks not No-Ack
         assertTrue("The subscription has been suspended",
-                   !_channel.getSubscription(browser).getState()
+                   !getChannel().getSubscription(browser).getState()
                            .equals(Subscription.State.SUSPENDED));       
     }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
index 47b5b1c1c2..595822173f 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
@@ -49,16 +49,16 @@ import org.apache.qpid.util.MockChannel;
 
 public class InternalBrokerBaseCase extends QpidTestCase
 {
-    protected IApplicationRegistry _registry;
-    protected MessageStore _messageStore;
-    protected MockChannel _channel;
-    protected InternalTestProtocolSession _session;
-    protected VirtualHost _virtualHost;
-    protected AMQQueue _queue;
-    protected AMQShortString QUEUE_NAME;
-    protected ServerConfiguration _configuration;
-    protected XMLConfiguration _configXml = new XMLConfiguration();
-    protected boolean _started = false;
+    private IApplicationRegistry _registry;
+    private MessageStore _messageStore;
+    private MockChannel _channel;
+    private InternalTestProtocolSession _session;
+    private VirtualHost _virtualHost;
+    private AMQQueue _queue;
+    private AMQShortString QUEUE_NAME;
+    private ServerConfiguration _configuration;
+    private XMLConfiguration _configXml = new XMLConfiguration();
+    private boolean _started = false;
 
     public void setUp() throws Exception
     {
@@ -266,4 +266,103 @@ public class InternalBrokerBaseCase extends QpidTestCase
         }
     }
 
+    public IApplicationRegistry getRegistry()
+    {
+        return _registry;
+    }
+
+    public void setRegistry(IApplicationRegistry registry)
+    {
+        _registry = registry;
+    }
+
+    public MessageStore getMessageStore()
+    {
+        return _messageStore;
+    }
+
+    public void setMessageStore(MessageStore messageStore)
+    {
+        _messageStore = messageStore;
+    }
+
+    public MockChannel getChannel()
+    {
+        return _channel;
+    }
+
+    public void setChannel(MockChannel channel)
+    {
+        _channel = channel;
+    }
+
+    public InternalTestProtocolSession getSession()
+    {
+        return _session;
+    }
+
+    public void setSession(InternalTestProtocolSession session)
+    {
+        _session = session;
+    }
+
+    public VirtualHost getVirtualHost()
+    {
+        return _virtualHost;
+    }
+
+    public void setVirtualHost(VirtualHost virtualHost)
+    {
+        _virtualHost = virtualHost;
+    }
+
+    public AMQQueue getQueue()
+    {
+        return _queue;
+    }
+
+    public void setQueue(AMQQueue queue)
+    {
+        _queue = queue;
+    }
+
+    public AMQShortString getQUEUE_NAME()
+    {
+        return QUEUE_NAME;
+    }
+
+    public void setQUEUE_NAME(AMQShortString QUEUE_NAME)
+    {
+        this.QUEUE_NAME = QUEUE_NAME;
+    }
+
+    public ServerConfiguration getConfiguration()
+    {
+        return _configuration;
+    }
+
+    public void setConfiguration(ServerConfiguration configuration)
+    {
+        _configuration = configuration;
+    }
+
+    public XMLConfiguration getConfigXml()
+    {
+        return _configXml;
+    }
+
+    public void setConfigXml(XMLConfiguration configXml)
+    {
+        _configXml = configXml;
+    }
+
+    public boolean isStarted()
+    {
+        return _started;
+    }
+
+    public void setStarted(boolean started)
+    {
+        _started = started;
+    }
 }