1 files changed, 15 insertions, 9 deletions
diff --git a/java/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java b/java/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
index a40a9bf12f..b874ca9594 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
@@ -22,9 +22,9 @@ package org.apache.qpid.server.store;
 
 import junit.framework.TestCase;
 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.BasicContentHeaderProperties;
 import org.apache.qpid.server.queue.AMQMessage;
 import org.apache.qpid.server.queue.MessageHandleFactory;
 import org.apache.qpid.server.txn.NonTransactionalContext;
@@ -36,6 +36,8 @@ public class TestReferenceCounting extends TestCase
 {
     private TestableMemoryMessageStore _store;
 
+    private StoreContext _storeContext = new StoreContext();
+
     protected void setUp() throws Exception
     {
         super.setUp();
@@ -48,14 +50,16 @@ public class TestReferenceCounting extends TestCase
     public void testMessageGetsRemoved() throws AMQException
     {
         createPersistentContentHeader();
-        AMQMessage message = new AMQMessage(_store.getNewMessageId(), new BasicPublishBody(),
-                                            new NonTransactionalContext(_store, null, null, null),
+        // TODO: fix hardcoded protocol version data
+        AMQMessage message = new AMQMessage(_store.getNewMessageId(), new BasicPublishBody((byte)8,
+                                                                                           (byte)0),
+                                            new NonTransactionalContext(_store, _storeContext, null, null, null),
                                             createPersistentContentHeader());
         message.incrementReference();
         // we call routing complete to set up the handle
-        message.routingComplete(_store, new MessageHandleFactory());
+        message.routingComplete(_store, _storeContext, new MessageHandleFactory());
         assertTrue(_store.getMessageMetaDataMap().size() == 1);
-        message.decrementReference();
+        message.decrementReference(_storeContext);
         assertTrue(_store.getMessageMetaDataMap().size() == 0);
     }
 
@@ -70,15 +74,17 @@ public class TestReferenceCounting extends TestCase
 
     public void testMessageRemains() throws AMQException
     {
-        AMQMessage message = new AMQMessage(_store.getNewMessageId(), new BasicPublishBody(),
-                                            new NonTransactionalContext(_store, null, null, null),
+        // TODO: fix hardcoded protocol version data
+        AMQMessage message = new AMQMessage(_store.getNewMessageId(), new BasicPublishBody((byte)8,
+                                                                                           (byte)0),
+                                            new NonTransactionalContext(_store, _storeContext, null, null, null),
                                             createPersistentContentHeader());
         message.incrementReference();
         // we call routing complete to set up the handle
-        message.routingComplete(_store, new MessageHandleFactory());
+        message.routingComplete(_store, _storeContext, new MessageHandleFactory());
         assertTrue(_store.getMessageMetaDataMap().size() == 1);
         message.incrementReference();
-        message.decrementReference();
+        message.decrementReference(_storeContext);
         assertTrue(_store.getMessageMetaDataMap().size() == 1);
     }