fixed broker compile errors

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

3 files changed, 20 insertions, 9 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQRequestBody.java b/java/common/src/main/java/org/apache/qpid/framing/AMQRequestBody.java
index 00a27a8869..623b2356ae 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQRequestBody.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQRequestBody.java
@@ -24,6 +24,8 @@ import org.apache.mina.common.ByteBuffer;
 
 public class AMQRequestBody extends AMQBody
 {
+    public static final byte TYPE = 9;
+
     // Fields declared in specification
     protected long requestId;
     protected long responseMark;
@@ -54,14 +56,14 @@ public class AMQRequestBody extends AMQBody
     
     protected int getSize()
     {
-        return 8 + 8 + 4 + methodPayload.getBodySize();
+        return 8 + 8 + 4 + methodPayload.getSize();
     }
     
     protected void writePayload(ByteBuffer buffer)
     {
         EncodingUtils.writeLong(buffer, requestId);
         EncodingUtils.writeLong(buffer, responseMark);
-        EncodingUtils.writeUnsignedShort(buffer, 0); // reserved, set to 0
+        EncodingUtils.writeInteger(buffer, 0); // reserved, set to 0
         methodPayload.writePayload(buffer);
     }
     
@@ -70,7 +72,7 @@ public class AMQRequestBody extends AMQBody
     {
         requestId = EncodingUtils.readLong(buffer);
         responseMark = EncodingUtils.readLong(buffer);
-        int reserved = EncodingUtils.readShort(buffer); // reserved, throw away
+        int reserved = EncodingUtils.readInteger(buffer); // reserved, throw away
         methodPayload.populateFromBuffer(buffer, size - 8 - 8 - 4);
     }
     
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQResponseBody.java b/java/common/src/main/java/org/apache/qpid/framing/AMQResponseBody.java
index 90038da2d4..2b0fc97b1b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQResponseBody.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQResponseBody.java
@@ -24,6 +24,8 @@ import org.apache.mina.common.ByteBuffer;
 
 public class AMQResponseBody extends AMQBody
 {
+    public static final byte TYPE = 10;
+
     // Fields declared in specification
     protected long responseId;
     protected long requestId;
@@ -54,14 +56,15 @@ public class AMQResponseBody extends AMQBody
     
     protected int getSize()
     {
-        return 8 + 8 + 4 + methodPayload.getBodySize();
+        return 8 + 8 + 4 + methodPayload.getSize();
     }
         
     protected void writePayload(ByteBuffer buffer)
     {
         EncodingUtils.writeLong(buffer, responseId);
         EncodingUtils.writeLong(buffer, requestId);
-        EncodingUtils.writeUnsignedShort(buffer, batchOffset);
+        // XXX
+        EncodingUtils.writeInteger(buffer, batchOffset);
         methodPayload.writePayload(buffer);
     }
     
@@ -70,7 +73,8 @@ public class AMQResponseBody extends AMQBody
     {
         responseId = EncodingUtils.readLong(buffer);
         requestId = EncodingUtils.readLong(buffer);
-        batchOffset = EncodingUtils.readShort(buffer);
+        // XXX
+        batchOffset = EncodingUtils.readInteger(buffer);
         methodPayload.populateFromBuffer(buffer, size - 8 - 8 - 4);
     }
     
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 5ec9b122af..e39d85277d 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
@@ -20,9 +20,10 @@
  */
 package org.apache.qpid.protocol;
 
+import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQDataBlock;
 import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.RequestResponseMappingException;
+import org.apache.qpid.protocol.AMQMethodEvent;
 import org.apache.qpid.protocol.AMQMethodListener;
 
 public interface AMQProtocolWriter
@@ -34,8 +35,12 @@ public interface AMQProtocolWriter
 	public void writeFrame(AMQDataBlock frame);
     
     public long writeRequest(int channelNum, AMQMethodBody methodBody,
-        AMQMethodListener methodListener) throws RequestResponseMappingException;
+                             AMQMethodListener methodListener)
+        throws AMQException;
 
     public void writeResponse(int channelNum, long requestId, AMQMethodBody methodBody)
-        throws RequestResponseMappingException;
+        throws AMQException;
+
+    public void writeResponse(AMQMethodEvent evt, AMQMethodBody response)
+        throws AMQException;
 }