1 files changed, 14 insertions, 15 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 3b7f5f3a51..7b58966a4c 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -52,7 +52,6 @@ import org.apache.qpid.server.store.StoredMessage;
 import org.apache.qpid.server.subscription.Subscription;
 import org.apache.qpid.server.util.InternalBrokerBaseCase;
 
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -277,7 +276,7 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
     static ContentHeaderBody getContentHeader(FieldTable headers)
     {
         ContentHeaderBody header = new ContentHeaderBody();
-        header.setProperties(getProperties(headers));
+        header.properties = getProperties(headers);
         return header;
     }
 
@@ -429,11 +428,21 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
                     //To change body of implemented methods use File | Settings | File Templates.
                 }
 
-                public boolean isRejectedBy(long subscriptionId)
+                public void reject(Subscription subscription)
+                {
+                    //To change body of implemented methods use File | Settings | File Templates.
+                }
+
+                public boolean isRejectedBy(Subscription subscription)
                 {
                     return false;  //To change body of implemented methods use File | Settings | File Templates.
                 }
 
+                public void requeue(Subscription subscription) 
+                {
+                    //To change body of implemented methods use File | Settings | File Templates.
+                }
+
                 public void dequeue()
                 {
                     //To change body of implemented methods use File | Settings | File Templates.
@@ -473,16 +482,6 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
                 {
                     return 0;  //To change body of implemented methods use File | Settings | File Templates.
                 }
-
-                public boolean isDequeued()
-                {
-                    return false;
-                }
-
-                public boolean isDispensed()
-                {
-                    return false;
-                }
             };
 
             if(action != null)
@@ -566,8 +565,8 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
             int pos = 0;
             for(ContentBody body : bodies)
             {
-                storedMessage.addContent(pos, ByteBuffer.wrap(body._payload));
-                pos += body._payload.length;
+                storedMessage.addContent(pos, body.payload.duplicate().buf());
+                pos += body.payload.limit();
             }
 
             _incoming = new TestIncomingMessage(getMessageId(),publish, protocolsession);