QPID-255 : Patch Supplied by Rob Godfrey - Change to use bespoke AMQShortString rather than converting to String

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

10 files changed, 65 insertions, 52 deletions

diff --git a/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java b/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
index 21ad1b6a7f..ec27b8a191 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
@@ -23,6 +23,7 @@ import org.apache.qpid.server.management.ManagedBroker;
 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.framing.AMQShortString;
 
 public class AMQBrokerManagerMBeanTest extends TestCase
 {
@@ -35,26 +36,26 @@ public class AMQBrokerManagerMBeanTest extends TestCase
         String exchange2 = "testExchange2_" +  System.currentTimeMillis();
         String exchange3 = "testExchange3_" +  System.currentTimeMillis();
 
-        assertTrue(_exchangeRegistry.getExchange(exchange1) == null);
-        assertTrue(_exchangeRegistry.getExchange(exchange2) == null);
-        assertTrue(_exchangeRegistry.getExchange(exchange3) == null);
+        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange1)) == null);
+        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange2)) == null);
+        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange3)) == null);
 
         ManagedBroker mbean = new AMQBrokerManagerMBean();
         mbean.createNewExchange(exchange1,"direct",false, false);
         mbean.createNewExchange(exchange2,"topic",false, false);
         mbean.createNewExchange(exchange3,"headers",false, false);
 
-        assertTrue(_exchangeRegistry.getExchange(exchange1) != null);
-        assertTrue(_exchangeRegistry.getExchange(exchange2) != null);
-        assertTrue(_exchangeRegistry.getExchange(exchange3) != null);
+        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange1)) != null);
+        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange2)) != null);
+        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange3)) != null);
 
         mbean.unregisterExchange(exchange1);
         mbean.unregisterExchange(exchange2);
         mbean.unregisterExchange(exchange3);
 
-        assertTrue(_exchangeRegistry.getExchange(exchange1) == null);
-        assertTrue(_exchangeRegistry.getExchange(exchange2) == null);
-        assertTrue(_exchangeRegistry.getExchange(exchange3) == null);
+        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange1)) == null);
+        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange2)) == null);
+        assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange3)) == null);
     }
 
     public void testQueueOperations() throws Exception
@@ -62,13 +63,13 @@ public class AMQBrokerManagerMBeanTest extends TestCase
         String queueName = "testQueue_" + System.currentTimeMillis();
         ManagedBroker mbean = new AMQBrokerManagerMBean();
 
-        assertTrue(_queueRegistry.getQueue(queueName) == null);
+        assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) == null);
                 
         mbean.createNewQueue(queueName, false, "test", true);
-        assertTrue(_queueRegistry.getQueue(queueName) != null);
+        assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) != null);
 
         mbean.deleteQueue(queueName);
-        assertTrue(_queueRegistry.getQueue(queueName) == null);
+        assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) == null);
     }
 
     @Override
diff --git a/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 6bcf640e4c..52afecdb6a 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -73,7 +73,7 @@ public class AbstractHeadersExchangeTestBase extends TestCase
 
     protected TestQueue bind(String queue, FieldTable bindings) throws AMQException
     {
-        return bind(new TestQueue(queue), bindings);
+        return bind(new TestQueue(new AMQShortString(queue)), bindings);
     }
 
     protected TestQueue bind(TestQueue queue, String... bindings) throws AMQException
@@ -144,7 +144,7 @@ public class AbstractHeadersExchangeTestBase extends TestCase
         for (String s : entries)
         {
             String[] parts = s.split("=", 2);
-            headers.put(parts[0], parts.length > 1 ? parts[1] : "");
+            headers.setObject(parts[0], parts.length > 1 ? parts[1] : "");
         }
         return headers;
     }
@@ -154,7 +154,7 @@ public class AbstractHeadersExchangeTestBase extends TestCase
         // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
         // TODO: Establish some way to determine the version for the test.
         BasicPublishBody request = new BasicPublishBody((byte)8, (byte)0);
-        request.routingKey = id;
+        request.routingKey = new AMQShortString(id);
         return request;
     }
 
@@ -176,9 +176,9 @@ public class AbstractHeadersExchangeTestBase extends TestCase
     {
         final List<HeadersExchangeTest.Message> messages = new ArrayList<HeadersExchangeTest.Message>();
 
-        public TestQueue(String name) throws AMQException
+        public TestQueue(AMQShortString name) throws AMQException
         {
-            super(name, false, "test", true, ApplicationRegistry.getInstance().getQueueRegistry());
+            super(name, false, new AMQShortString("test"), true, ApplicationRegistry.getInstance().getQueueRegistry());
         }
 
         /**
diff --git a/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java b/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
index bb88d2e8d0..39c47118da 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
@@ -22,6 +22,8 @@ import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.management.ManagedObject;
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.framing.AMQShortString;
 
 import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.TabularData;
@@ -43,12 +45,12 @@ public class ExchangeMBeanTest  extends TestCase
     public void testDirectExchangeMBean() throws Exception
     {
         DestNameExchange exchange = new DestNameExchange();
-        exchange.initialise("amq.direct", false, 0, true);
+        exchange.initialise(ExchangeDefaults.DIRECT_EXCHANGE_NAME, false, 0, true);
         ManagedObject managedObj = exchange.getManagedObject();
         ManagedExchange mbean = (ManagedExchange)managedObj;
 
-        mbean.createNewBinding(_queue.getName(), "binding1");
-        mbean.createNewBinding(_queue.getName(), "binding2");
+        mbean.createNewBinding(_queue.getName().toString(), "binding1");
+        mbean.createNewBinding(_queue.getName().toString(), "binding2");
 
         TabularData data = mbean.bindings();
         ArrayList<CompositeData> list = new ArrayList<CompositeData>(data.values());
@@ -70,12 +72,12 @@ public class ExchangeMBeanTest  extends TestCase
     public void testTopicExchangeMBean() throws Exception
     {
         DestWildExchange exchange = new DestWildExchange();
-        exchange.initialise("amq.topic", false, 0, true);
+        exchange.initialise(ExchangeDefaults.TOPIC_EXCHANGE_NAME, false, 0, true);
         ManagedObject managedObj = exchange.getManagedObject();
         ManagedExchange mbean = (ManagedExchange)managedObj;
 
-        mbean.createNewBinding(_queue.getName(), "binding1");
-        mbean.createNewBinding(_queue.getName(), "binding2");
+        mbean.createNewBinding(_queue.getName().toString(), "binding1");
+        mbean.createNewBinding(_queue.getName().toString(), "binding2");
 
         TabularData data = mbean.bindings();
         ArrayList<CompositeData> list = new ArrayList<CompositeData>(data.values());
@@ -97,19 +99,19 @@ public class ExchangeMBeanTest  extends TestCase
     public void testHeadersExchangeMBean() throws Exception
     {
         HeadersExchange exchange = new HeadersExchange();
-        exchange.initialise("amq.headers", false, 0, true);
+        exchange.initialise(ExchangeDefaults.HEADERS_EXCHANGE_NAME, false, 0, true);
         ManagedObject managedObj = exchange.getManagedObject();
         ManagedExchange mbean = (ManagedExchange)managedObj;
 
-        mbean.createNewBinding(_queue.getName(), "key1=binding1,key2=binding2");
-        mbean.createNewBinding(_queue.getName(), "key3=binding3");
+        mbean.createNewBinding(_queue.getName().toString(), "key1=binding1,key2=binding2");
+        mbean.createNewBinding(_queue.getName().toString(), "key3=binding3");
 
         TabularData data = mbean.bindings();
         ArrayList<CompositeData> list = new ArrayList<CompositeData>(data.values());
         assertTrue(list.size() == 2);
 
         // test general exchange properties
-        assertEquals(mbean.getName(), "amq.headers");
+        assertEquals(mbean.getName(), "amq.match");
         assertEquals(mbean.getExchangeType(), "headers");
         assertTrue(mbean.getTicketNo() == 0);
         assertTrue(!mbean.isDurable());
@@ -121,7 +123,7 @@ public class ExchangeMBeanTest  extends TestCase
     {
         super.setUp();
         _queueRegistry = ApplicationRegistry.getInstance().getQueueRegistry();
-        _queue = new AMQQueue("testQueue", false, "ExchangeMBeanTest", false, _queueRegistry);
+        _queue = new AMQQueue(new AMQShortString("testQueue"), false, new AMQShortString("ExchangeMBeanTest"), false, _queueRegistry);
         _queueRegistry.registerQueue(_queue);
     }
 }
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
index 3ff3f9cc43..d4a8f6c7f9 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
@@ -21,6 +21,7 @@ import junit.framework.TestCase;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.BasicPublishBody;
 import org.apache.qpid.framing.ContentHeaderBody;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.RequiredDeliveryException;
 import org.apache.qpid.server.txn.TransactionalContext;
@@ -77,7 +78,7 @@ public class AMQQueueMBeanTest extends TestCase
         _protocolSession = new MockProtocolSession(_messageStore);
         _protocolSession.addChannel(_channel);
 
-        _queue.registerProtocolSession(_protocolSession, 1, "test", false, null);
+        _queue.registerProtocolSession(_protocolSession, 1, new AMQShortString("test"), false, null);
         assertTrue(_queueMBean.getActiveConsumerCount() == 1);
 
         SubscriptionSet _subscribers = (SubscriptionSet) mgr;
@@ -174,7 +175,7 @@ public class AMQQueueMBeanTest extends TestCase
     {
         super.setUp();
         _queueRegistry = new DefaultQueueRegistry();
-        _queue = new AMQQueue("testQueue", false, "AMQueueMBeanTest", false, _queueRegistry);
+        _queue = new AMQQueue(new AMQShortString("testQueue"), false, new AMQShortString("AMQueueMBeanTest"), false, _queueRegistry);
         _queueMBean = new AMQQueueMBean(_queue);
     }
 
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java b/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java
index 0180c2d30c..222b2c696a 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java
@@ -26,6 +26,7 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.BasicPublishBody;
 import org.apache.qpid.framing.ContentHeaderBody;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.RequiredDeliveryException;
 import org.apache.qpid.server.ack.UnacknowledgedMessage;
@@ -62,6 +63,8 @@ public class AckTest extends TestCase
 
     private AMQQueue _queue;
 
+    private static final AMQShortString DEFAULT_CONSUMER_TAG = new AMQShortString("conTag");
+
     public AckTest() throws Exception
     {
         ApplicationRegistry.initialise(new TestApplicationRegistry());
@@ -75,7 +78,7 @@ public class AckTest extends TestCase
         _protocolSession = new MockProtocolSession(_messageStore);
         _protocolSession.addChannel(_channel);
         _subscriptionManager = new SubscriptionSet();
-        _queue = new AMQQueue("myQ", false, "guest", true, new DefaultQueueRegistry(), _subscriptionManager);
+        _queue = new AMQQueue(new AMQShortString("myQ"), false, new AMQShortString("guest"), true, new DefaultQueueRegistry(), _subscriptionManager);
     }
 
     private void publishMessages(int count) throws AMQException
@@ -94,8 +97,8 @@ public class AckTest extends TestCase
             // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
             // TODO: Establish some way to determine the version for the test.
             BasicPublishBody publishBody = new BasicPublishBody((byte)8, (byte)0);
-            publishBody.routingKey = "rk";
-            publishBody.exchange = "someExchange";
+            publishBody.routingKey = new AMQShortString("rk");
+            publishBody.exchange = new AMQShortString("someExchange");
             AMQMessage msg = new AMQMessage(_messageStore.getNewMessageId(), publishBody, txnContext);
             if (persistent)
             {
@@ -126,7 +129,7 @@ public class AckTest extends TestCase
      */
     public void testAckChannelAssociationTest() throws AMQException
     {
-        _subscription = new SubscriptionImpl(5, _protocolSession, "conTag", true);
+        _subscription = new SubscriptionImpl(5, _protocolSession, DEFAULT_CONSUMER_TAG, true);
         final int msgCount = 10;
         publishMessages(msgCount, true);
 
@@ -154,7 +157,7 @@ public class AckTest extends TestCase
     public void testNoAckMode() throws AMQException
     {
         // false arg means no acks expected
-        _subscription = new SubscriptionImpl(5, _protocolSession, "conTag", false);
+        _subscription = new SubscriptionImpl(5, _protocolSession, DEFAULT_CONSUMER_TAG, false);
         final int msgCount = 10;
         publishMessages(msgCount);
 
@@ -169,7 +172,7 @@ public class AckTest extends TestCase
      */
     public void testSingleAckReceivedTest() throws AMQException
     {
-        _subscription = new SubscriptionImpl(5, _protocolSession, "conTag", true);
+        _subscription = new SubscriptionImpl(5, _protocolSession, DEFAULT_CONSUMER_TAG, true);
         final int msgCount = 10;
         publishMessages(msgCount);
 
@@ -198,7 +201,7 @@ public class AckTest extends TestCase
      */
     public void testMultiAckReceivedTest() throws AMQException
     {
-        _subscription = new SubscriptionImpl(5, _protocolSession, "conTag", true);
+        _subscription = new SubscriptionImpl(5, _protocolSession, DEFAULT_CONSUMER_TAG, true);
         final int msgCount = 10;
         publishMessages(msgCount);
 
@@ -222,7 +225,7 @@ public class AckTest extends TestCase
      */
     public void testMultiAckAllReceivedTest() throws AMQException
     {
-        _subscription = new SubscriptionImpl(5, _protocolSession, "conTag", true);
+        _subscription = new SubscriptionImpl(5, _protocolSession, DEFAULT_CONSUMER_TAG, true);
         final int msgCount = 10;
         publishMessages(msgCount);
 
@@ -246,7 +249,7 @@ public class AckTest extends TestCase
         int lowMark = 5;
         int highMark = 10;
 
-        _subscription = new SubscriptionImpl(5, _protocolSession, "conTag", true);
+        _subscription = new SubscriptionImpl(5, _protocolSession, DEFAULT_CONSUMER_TAG, true);
         _channel.setPrefetchLowMarkCount(lowMark);
         _channel.setPrefetchHighMarkCount(highMark);
 
@@ -297,7 +300,7 @@ public class AckTest extends TestCase
 
     public void testPrefetch() throws AMQException
     {
-        _subscription = new SubscriptionImpl(5, _protocolSession, "conTag", true);
+        _subscription = new SubscriptionImpl(5, _protocolSession, DEFAULT_CONSUMER_TAG, true);
         _channel.setPrefetchCount(5);
 
         assertTrue(_channel.getPrefetchCount() == 5);
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java b/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
index 8efefaeff5..e428b9ef60 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
@@ -21,6 +21,7 @@
 package org.apache.qpid.server.queue;
 
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.handler.OnCurrentThreadExecutor;
 
 import java.util.*;
@@ -52,7 +53,7 @@ public class ConcurrencyTest extends MessageTestHelper
 
     public ConcurrencyTest() throws Exception
     {
-        _deliveryMgr = new ConcurrentDeliveryManager(_subscriptionMgr, new AMQQueue("myQ", false, "guest", false,
+        _deliveryMgr = new ConcurrentDeliveryManager(_subscriptionMgr, new AMQQueue(new AMQShortString("myQ"), false, new AMQShortString("guest"), false,
                                                                           new DefaultQueueRegistry()));
     }
 
@@ -186,7 +187,7 @@ public class ConcurrencyTest extends MessageTestHelper
             AMQMessage msg = nextMessage();
             if (msg != null)
             {
-                _deliveryMgr.deliver(null, toString(), msg);
+                _deliveryMgr.deliver(null, new AMQShortString(toString()), msg);
             }
         }
     }
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrentDeliveryManagerTest.java b/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrentDeliveryManagerTest.java
index 3072d44f48..1943532a51 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrentDeliveryManagerTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrentDeliveryManagerTest.java
@@ -21,6 +21,7 @@
 package org.apache.qpid.server.queue;
 
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.queue.ConcurrentDeliveryManager;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.DefaultQueueRegistry;
@@ -33,7 +34,7 @@ public class ConcurrentDeliveryManagerTest extends DeliveryManagerTest
         try
         {
             System.setProperty("concurrentdeliverymanager","true");
-            _mgr = new ConcurrentDeliveryManager(_subscriptions, new AMQQueue("myQ", false, "guest", false,
+            _mgr = new ConcurrentDeliveryManager(_subscriptions, new AMQQueue(new AMQShortString("myQ"), false, new AMQShortString("guest"), false,
                                                                               new DefaultQueueRegistry()));
         }
         catch (Throwable t)
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java b/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
index fcd2806861..d88614298f 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
@@ -23,6 +23,7 @@ package org.apache.qpid.server.queue;
 import org.apache.qpid.server.handler.OnCurrentThreadExecutor;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
 
 import junit.framework.TestSuite;
 
@@ -31,6 +32,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper
     protected final SubscriptionSet _subscriptions = new SubscriptionSet();
     protected DeliveryManager _mgr;
     protected StoreContext _storeContext = new StoreContext();
+    private static final AMQShortString DEFAULT_QUEUE_NAME = new AMQShortString("Me");
 
     public DeliveryManagerTest() throws Exception
     {
@@ -47,7 +49,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper
 
         for (int i = 0; i < batch; i++)
         {
-            _mgr.deliver(_storeContext, "Me", messages[i]);
+            _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i]);
         }
 
         SubscriptionTestHelper s1 = new SubscriptionTestHelper("1");
@@ -57,7 +59,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper
 
         for (int i = batch; i < messages.length; i++)
         {
-            _mgr.deliver(_storeContext, "Me", messages[i]);
+            _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i]);
         }
 
         assertTrue(s1.getMessages().isEmpty());
@@ -95,7 +97,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper
 
         for (int i = 0; i < batch; i++)
         {
-            _mgr.deliver(_storeContext, "Me", messages[i]);
+            _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i]);
         }
 
         assertEquals(batch, s1.getMessages().size());
@@ -109,7 +111,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper
         s1.setSuspended(true);
         for (int i = batch; i < messages.length; i++)
         {
-            _mgr.deliver(_storeContext, "Me", messages[i]);
+            _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i]);
         }
 
         _mgr.processAsync(new OnCurrentThreadExecutor());
@@ -131,7 +133,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper
         try
         {
             AMQMessage msg = message(true);
-            _mgr.deliver(_storeContext, "Me", msg);
+            _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, msg);
             msg.checkDeliveredToConsumer();
             fail("expected exception did not occur");
         }
@@ -153,7 +155,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper
             _subscriptions.addSubscriber(s);
             s.setSuspended(true);
             AMQMessage msg = message(true);
-            _mgr.deliver(_storeContext, "Me", msg);
+            _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, msg);
             msg.checkDeliveredToConsumer();
             fail("expected exception did not occur");
         }
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java b/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java
index 87e5c43932..3586749f53 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java
@@ -23,6 +23,7 @@ package org.apache.qpid.server.queue;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQDataBlock;
 import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
 import org.apache.qpid.server.store.MessageStore;
@@ -53,12 +54,12 @@ public class MockProtocolSession implements AMQProtocolSession
     {
     }
 
-    public String getContextKey()
+    public AMQShortString getContextKey()
     {
         return null;
     }
 
-    public void setContextKey(String contextKey)
+    public void setContextKey(AMQShortString contextKey)
     {
     }
 
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java b/java/systests/src/test/java/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java
index ebe8e192a0..3c5aab0911 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java
@@ -25,6 +25,7 @@ import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.DefaultQueueRegistry;
 import org.apache.qpid.server.queue.DeliveryManagerTest;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.framing.AMQShortString;
 
 import junit.framework.TestSuite;
 
@@ -35,7 +36,7 @@ public class SynchronizedDeliveryManagerTest extends DeliveryManagerTest
         try
         {
             System.setProperty("concurrentdeliverymanager","false");
-            _mgr = new SynchronizedDeliveryManager(_subscriptions, new AMQQueue("myQ", false, "guest", false,
+            _mgr = new SynchronizedDeliveryManager(_subscriptions, new AMQQueue(new AMQShortString("myQ"), false, new AMQShortString("guest"), false,
                                                                                 new DefaultQueueRegistry()));
         }
         catch (Throwable t)