Author: rhs
Date: Tue Jan 16 09:02:08 2007
New Revision: 496768
URL: http://svn.apache.org/viewvc?view=rev&rev=496768
Log:
added request/response factories to AMQDataBlockDecoder
Modified:
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQRequestBody.java
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQResponseBody.java
Modified:
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java?view=diff&rev=496768&r1=496767&r2=496768
==============================================================================
---
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
(original)
+++
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
Tue Jan 16 09:02:08 2007
@@ -36,7 +36,16 @@
public AMQDataBlockDecoder()
{
- _supportedBodies.put(new Byte(AMQMethodBody.TYPE),
AMQMethodBodyFactory.getInstance());
+ _supportedBodies.put(new Byte(AMQRequestBody.TYPE), new BodyFactory() {
+ public AMQBody createBody(ByteBuffer in) {
+ return new AMQRequestBody();
+ }
+ });
+ _supportedBodies.put(new Byte(AMQResponseBody.TYPE), new BodyFactory()
{
+ public AMQBody createBody(ByteBuffer in) {
+ return new AMQResponseBody();
+ }
+ });
_supportedBodies.put(new Byte(HeartbeatBody.TYPE), new
HeartbeatBodyFactory());
}
Modified:
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java?view=diff&rev=496768&r1=496767&r2=496768
==============================================================================
---
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
(original)
+++
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
Tue Jan 16 09:02:08 2007
@@ -39,7 +39,7 @@
_log.debug("Creating method body factory");
}
- public AMQBody createBody(ByteBuffer in) throws AMQFrameDecodingException
+ public AMQMethodBody createBody(ByteBuffer in) throws
AMQFrameDecodingException
{
// AMQP version change: MethodBodyDecoderRegistry is obsolete, since
all the XML
// segments generated together are now handled by MainRegistry. The
Cluster class,
Modified:
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQRequestBody.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQRequestBody.java?view=diff&rev=496768&r1=496767&r2=496768
==============================================================================
---
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQRequestBody.java
(original)
+++
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQRequestBody.java
Tue Jan 16 09:02:08 2007
@@ -73,6 +73,8 @@
requestId = EncodingUtils.readLong(buffer);
responseMark = EncodingUtils.readLong(buffer);
int reserved = EncodingUtils.readInteger(buffer); // reserved, throw
away
+ AMQMethodBodyFactory factory = AMQMethodBodyFactory.getInstance();
+ methodPayload = factory.createBody(buffer);
methodPayload.populateFromBuffer(buffer, size - 8 - 8 - 4);
}
Modified:
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQResponseBody.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQResponseBody.java?view=diff&rev=496768&r1=496767&r2=496768
==============================================================================
---
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQResponseBody.java
(original)
+++
incubator/qpid/branches/qpid.0-9/java/common/src/main/java/org/apache/qpid/framing/AMQResponseBody.java
Tue Jan 16 09:02:08 2007
@@ -75,6 +75,8 @@
requestId = EncodingUtils.readLong(buffer);
// XXX
batchOffset = EncodingUtils.readInteger(buffer);
+ AMQMethodBodyFactory factory = AMQMethodBodyFactory.getInstance();
+ methodPayload = factory.createBody(buffer);
methodPayload.populateFromBuffer(buffer, size - 8 - 8 - 4);
}
