diff options
Diffstat (limited to 'java')
5 files changed, 10 insertions, 11 deletions
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 412b65cc01..63f3bf1133 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 @@ -34,7 +34,7 @@ public class AMQResponseBody extends AMQBody // Constructor public AMQResponseBody() {} - public AMQResponseBody(long getResponseId, long getRequestId, + public AMQResponseBody(long responseId, long requestId, int batchOffset, AMQMethodBody methodPayload) { this.responseId = responseId; 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 0ed13094c7..bfc6ad6e87 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 @@ -105,9 +105,9 @@ public class Content EncodingUtils.writeLongStringBytes(buffer, content); } - public void populateFromBuffer(ByteBuffer buffer, long size) throws AMQFrameDecodingException + public void populateFromBuffer(ByteBuffer buffer) throws AMQFrameDecodingException { - contentType = ContentTypeEnum.toContentEnum(buffer.get()); - content = EncodingUtils.readLongstr(buffer); + contentType = ContentTypeEnum.toContentEnum(buffer.get()); + content = EncodingUtils.readLongstr(buffer); } } diff --git a/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java b/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java index 1c3faf49f8..1d7dd33c76 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java +++ b/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java @@ -307,9 +307,8 @@ public class EncodingUtils public static Content readContent(ByteBuffer buffer) throws AMQFrameDecodingException { - long length = buffer.getUnsignedInt(); Content content = new Content(); - content.populateFromBuffer(buffer, length); + content.populateFromBuffer(buffer); return content; } diff --git a/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java b/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java index 5b34c11d11..d6c72290c4 100644 --- a/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java +++ b/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java @@ -52,7 +52,7 @@ public class ResponseManager * function xxxx(). (TODO) */ public enum batchResponseModeEnum { NONE } - private batchResponseModeEnum batchResponseMode; + private batchResponseModeEnum batchResponseMode = batchResponseModeEnum.NONE; /** * Request and response frames must have a requestID and responseID which @@ -121,7 +121,7 @@ public class ResponseManager ResponseStatus responseStatus = responseMap.get(requestId); if (responseStatus == null) throw new RequestResponseMappingException(requestId, - "Failed to locate requestId " + requestId + " in responseMap."); + "Failed to locate requestId " + requestId + " in responseMap." + responseMap); if (responseStatus.responseMethodBody != null) throw new RequestResponseMappingException(requestId, "RequestId " + requestId + " already has a response in responseMap."); @@ -218,7 +218,7 @@ public class ResponseManager private void sendResponseBatch(long firstRequestId, int numAdditionalRequests, AMQMethodBody responseMethodBody) { - long responseId = getNextResponseId(); // Get new request ID + long responseId = getNextResponseId(); // Get new response ID AMQFrame responseFrame = AMQResponseBody.createAMQFrame(channel, responseId, firstRequestId, numAdditionalRequests, responseMethodBody); protocolWriter.writeFrame(responseFrame); 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 e39d85277d..63c464e5af 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 @@ -32,8 +32,8 @@ public interface AMQProtocolWriter * Write a datablock, encoding where necessary (e.g. into a sequence of bytes) * @param frame the frame to be encoded and written */ - public void writeFrame(AMQDataBlock frame); - + public void writeFrame(AMQDataBlock frame); + public long writeRequest(int channelNum, AMQMethodBody methodBody, AMQMethodListener methodListener) throws AMQException; |