diff options
| author | Gordon Sim <gsim@apache.org> | 2008-04-30 14:16:38 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2008-04-30 14:16:38 +0000 |
| commit | 9262e03f9381782009a4da0f50d36aaabd20bbe3 (patch) | |
| tree | fb1336bd50cde3f2c12c438cc2820fe8e2a68abf /qpid/java/common/src | |
| parent | 64e275540e85fba886809845a08aec52ba2c4add (diff) | |
| download | qpid-python-9262e03f9381782009a4da0f50d36aaabd20bbe3.tar.gz | |
QPID-988 and QPID-989: fixes to framing for final 0-10 spec
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@652386 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src')
4 files changed, 3 insertions, 2 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java b/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java index 0f6180f54a..a4c46be89c 100644 --- a/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java +++ b/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java @@ -272,6 +272,7 @@ abstract class AbstractDecoder implements Decoder { long size = readUint32(); int start = count; + long fieldCount = readUint32(); Map<String,Object> result = new LinkedHashMap(); while (count < start + size) { diff --git a/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java b/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java index 56b4537719..f68884f812 100644 --- a/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java +++ b/qpid/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java @@ -383,6 +383,7 @@ abstract class AbstractEncoder implements Encoder sizer.writeMap(map); // XXX: - 4 writeUint32(sizer.size() - 4); + writeUint32(map.size()); writeMapEntries(map); } diff --git a/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java b/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java index 2d41a9f516..c966a111ec 100644 --- a/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java +++ b/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java @@ -218,7 +218,7 @@ public class InputHandler implements Receiver<ByteBuffer> return FRAME_END; } case FRAME_END: - return expect(buf, OutputHandler.FRAME_END, FRAME_HDR); + return FRAME_HDR; default: throw new IllegalStateException(); } diff --git a/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/OutputHandler.java b/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/OutputHandler.java index 8f615cf80d..64dcdb131f 100644 --- a/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/OutputHandler.java +++ b/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/OutputHandler.java @@ -86,7 +86,6 @@ public class OutputHandler implements Sender<NetworkEvent>, NetworkDelegate { hdr.put(buf); } - hdr.put((byte) FRAME_END); hdr.flip(); synchronized (lock) { |