diff options
Diffstat (limited to 'java')
4 files changed, 3 insertions, 2 deletions
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java b/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java index 0f6180f54a..a4c46be89c 100644 --- a/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java +++ b/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/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java b/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java index 56b4537719..f68884f812 100644 --- a/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java +++ b/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/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java b/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java index 2d41a9f516..c966a111ec 100644 --- a/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java +++ b/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/java/common/src/main/java/org/apache/qpidity/transport/network/OutputHandler.java b/java/common/src/main/java/org/apache/qpidity/transport/network/OutputHandler.java index 8f615cf80d..64dcdb131f 100644 --- a/java/common/src/main/java/org/apache/qpidity/transport/network/OutputHandler.java +++ b/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) { |