1 files changed, 5 insertions, 19 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java b/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
index 01beb3af77..4d9826d83c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.framing;
 
 import java.io.DataInput;
-import java.io.DataInputStream;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -73,33 +72,20 @@ public class ContentBody implements AMQBody
         session.contentBodyReceived(channelId, this);
     }
 
-    protected void populateFromBuffer(DataInputStream buffer, long size) throws AMQFrameDecodingException, IOException
-    {
-        if (size > 0)
-        {
-            _payload = new byte[(int)size];
-            buffer.read(getPayload());
-        }
-
-    }
-
-    public void reduceBufferToFit()
-    {
-    }
-
     public byte[] getPayload()
     {
         return _payload;
     }
 
-    public static void process(final int channel,
-                                  final MarkableDataInput in,
-                                  final MethodProcessor methodProcessor, final long bodySize)
+    public static void process(final MarkableDataInput in,
+                               final ChannelMethodProcessor methodProcessor, final long bodySize)
             throws IOException
     {
+
         byte[] payload = new byte[(int)bodySize];
         in.readFully(payload);
-        methodProcessor.receiveMessageContent(channel, payload);
+
+        methodProcessor.receiveMessageContent(payload);
     }
 
     private static class BufferContentBody implements AMQBody