You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/05/19 20:12:43 UTC

[2/2] qpid-broker-j git commit: QPID-8194: [Protocol Tests] [AMQP 1.0] Fix test failure

QPID-8194: [Protocol Tests] [AMQP 1.0] Fix test failure

InputHandler assumed that it was safe to mutate the bytes received from the wire after decoding the performatives.  This is incorrect - the payload of payload carrying frames will be corrupted.
The issue happened to appear on Windows simply owing to the relative interleving of reads/writes between the peers.


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/711e0076
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/711e0076
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/711e0076

Branch: refs/heads/master
Commit: 711e00762b3e634ada35a8a4abf9ee0e1f800a82
Parents: 7522bcf
Author: Keith Wall <kw...@apache.org>
Authored: Sat May 19 19:39:54 2018 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Sat May 19 21:10:28 2018 +0100

----------------------------------------------------------------------
 .../qpid/tests/protocol/v1_0/messaging/TransferTest.java       | 3 ---
 .../main/java/org/apache/qpid/tests/protocol/InputHandler.java | 6 ------
 2 files changed, 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/711e0076/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/TransferTest.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/TransferTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/TransferTest.java
index 0c34381..7d1b1b6 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/TransferTest.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/TransferTest.java
@@ -982,8 +982,6 @@ public class TransferTest extends BrokerAdminUsingTestBase
     @SpecificationTest(section = "2.6.12", description = "Transferring A Message.")
     public void receiveMultipleDeliveries() throws Exception
     {
-        assumeFalse("QPID-8194: Tests fail whilst decoding message (uninvestigated)", SystemUtils.isWindows());
-
         int numberOfMessages = 4;
         for (int i = 0; i < numberOfMessages; i++)
         {
@@ -1046,7 +1044,6 @@ public class TransferTest extends BrokerAdminUsingTestBase
     @SpecificationTest(section = "2.6.12", description = "Transferring A Message.")
     public void receiveMixtureOfTransactionalAndNonTransactionalDeliveries() throws Exception
     {
-        assumeFalse("QPID-8194: Tests fail whilst decoding message (uninvestigated)", SystemUtils.isWindows());
         int numberOfMessages = 4;
         for (int i = 0; i < numberOfMessages; i++)
         {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/711e0076/systests/protocol-tests-core/src/main/java/org/apache/qpid/tests/protocol/InputHandler.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-core/src/main/java/org/apache/qpid/tests/protocol/InputHandler.java b/systests/protocol-tests-core/src/main/java/org/apache/qpid/tests/protocol/InputHandler.java
index 2d5fb45..5a1de51 100644
--- a/systests/protocol-tests-core/src/main/java/org/apache/qpid/tests/protocol/InputHandler.java
+++ b/systests/protocol-tests-core/src/main/java/org/apache/qpid/tests/protocol/InputHandler.java
@@ -70,12 +70,6 @@ public class InputHandler extends ChannelInboundHandlerAdapter
 
         LOGGER.debug("After parsing, {} byte(s) remained", _inputBuffer.remaining());
 
-        if (_inputBuffer.hasRemaining())
-        {
-            _inputBuffer.compact();
-            _inputBuffer.flip();
-        }
-
         ReferenceCountUtil.release(msg);
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org