Repository: qpid-broker-j Updated Branches: refs/heads/6.1.x ed320c224 -> 6efc91066
QPID-7763: Fix failing test and dispose end of frame buffer in amqp 0-9 Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/6efc9106 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/6efc9106 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/6efc9106 Branch: refs/heads/6.1.x Commit: 6efc91066968e4226a905bc903f2b2d228843acb Parents: ed320c2 Author: Alex Rudyy <[email protected]> Authored: Thu May 4 10:06:49 2017 +0100 Committer: Alex Rudyy <[email protected]> Committed: Thu May 4 10:06:49 2017 +0100 ---------------------------------------------------------------------- common/src/main/java/org/apache/qpid/framing/AMQFrame.java | 4 +++- .../test/java/org/apache/qpid/bytebuffer/QpidByteBufferTest.java | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6efc9106/common/src/main/java/org/apache/qpid/framing/AMQFrame.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/qpid/framing/AMQFrame.java b/common/src/main/java/org/apache/qpid/framing/AMQFrame.java index e838dd4..af7a189 100644 --- a/common/src/main/java/org/apache/qpid/framing/AMQFrame.java +++ b/common/src/main/java/org/apache/qpid/framing/AMQFrame.java @@ -68,7 +68,9 @@ public class AMQFrame extends AMQDataBlock implements EncodableAMQDataBlock frameHeader.dispose(); long size = 8 + _bodyFrame.writePayload(sender); - sender.send(FRAME_END_BYTE_BUFFER.duplicate()); + QpidByteBuffer endFrame = FRAME_END_BYTE_BUFFER.duplicate(); + sender.send(endFrame); + endFrame.dispose(); return size; } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6efc9106/common/src/test/java/org/apache/qpid/bytebuffer/QpidByteBufferTest.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/qpid/bytebuffer/QpidByteBufferTest.java b/common/src/test/java/org/apache/qpid/bytebuffer/QpidByteBufferTest.java index 67f5634..2d89949 100644 --- a/common/src/test/java/org/apache/qpid/bytebuffer/QpidByteBufferTest.java +++ b/common/src/test/java/org/apache/qpid/bytebuffer/QpidByteBufferTest.java @@ -897,8 +897,6 @@ public class QpidByteBufferTest extends QpidTestCase int inflatedBytesTotal = 0; for(QpidByteBuffer inflatedBuf : inflatedBufs) { - assertEquals("Inflated buf " + bufNum + " is of wrong type", direct, inflatedBuf.isDirect()); - int inflatedBytesCount = inflatedBuf.remaining(); inflatedBytesTotal += inflatedBytesCount; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
