removed XXX from resend, centralized message deliver, cleaned up exception handling, added per channel max frame size

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@499121 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 8 insertions, 8 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/framing/Content.java b/java/common/src/main/java/org/apache/qpid/framing/Content.java
index 222500aa8a..31b947d50a 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/Content.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/Content.java
@@ -65,6 +65,7 @@ public class Content
     	this.contentType = contentType;
         this.content = ByteBuffer.allocate(content.length);
         this.content.put(content);
+        this.content.flip();
     }
     
     public Content(TypeEnum contentType, String contentStr)
@@ -99,7 +100,7 @@ public class Content
     
     public byte[] getContentAsByteArray()
     {
-        ByteBuffer dup = content.duplicate().rewind();
+        ByteBuffer dup = content.duplicate();
         byte[] ba = new byte[dup.remaining()];
         dup.get(ba);
         return ba;
@@ -123,9 +124,11 @@ public class Content
     
     public void writePayload(ByteBuffer buffer)
     {
+        System.out.println("Before: " + content);
     	EncodingUtils.writeUnsignedByte(buffer, contentType.toByte());
     	EncodingUtils.writeUnsignedInteger(buffer, content.remaining());
         buffer.put(content);
+        System.out.println("After: " + content);
     }
     
     public void populateFromBuffer(ByteBuffer buffer) throws AMQFrameDecodingException
@@ -139,6 +142,6 @@ public class Content
     
     public synchronized String toString()
     {
-        return getContent().rewind().toString();
+        return getContent().toString();
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java b/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java
index 63c464e5af..d07af78544 100644
--- a/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java
+++ b/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java
@@ -35,12 +35,9 @@ public interface AMQProtocolWriter
     public void writeFrame(AMQDataBlock frame);
 
     public long writeRequest(int channelNum, AMQMethodBody methodBody,
-                             AMQMethodListener methodListener)
-        throws AMQException;
+                             AMQMethodListener methodListener);
 
-    public void writeResponse(int channelNum, long requestId, AMQMethodBody methodBody)
-        throws AMQException;
+    public void writeResponse(int channelNum, long requestId, AMQMethodBody methodBody);
 
-    public void writeResponse(AMQMethodEvent evt, AMQMethodBody response)
-        throws AMQException;
+    public void writeResponse(AMQMethodEvent evt, AMQMethodBody response);
 }