diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2012-02-21 11:38:00 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2012-02-21 11:38:00 +0000 |
| commit | 0fd4cce889db15889042bb447e87561d1d66df64 (patch) | |
| tree | 140106062b19f08a1527f493ae863d7694afb82f /java | |
| parent | 70c5ef6729ab5b5042a132cb086fe04ba31cd86b (diff) | |
| download | qpid-python-0fd4cce889db15889042bb447e87561d1d66df64.tar.gz | |
QPID-3597 : Python Headers Exchange tests fail against Java Broker (Java AMQP 0-10 transport cannot cope with message transfers with no body and no headers)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1291719 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java | 2 | ||||
| -rw-r--r-- | java/test-profiles/python_tests/Java010PythonExcludes | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java b/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java index b80d5dfd30..a80b988cea 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java +++ b/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java @@ -189,7 +189,7 @@ public class Assembler implements Receiver<NetworkEvent>, NetworkDelegate command = Method.create(commandType); command.setSync((0x0001 & hdr) != 0); command.read(dec); - if (command.hasPayload()) + if (command.hasPayload() && !frame.isLastSegment()) { setIncompleteCommand(channel, command); } diff --git a/java/test-profiles/python_tests/Java010PythonExcludes b/java/test-profiles/python_tests/Java010PythonExcludes index 4e39c18797..70a15fea9b 100644 --- a/java/test-profiles/python_tests/Java010PythonExcludes +++ b/java/test-profiles/python_tests/Java010PythonExcludes @@ -78,8 +78,6 @@ qpid_tests.broker_0_10.alternate_exchange.AlternateExchangeTests.test_add_altern qpid_tests.broker_0_10.new_api.GeneralTests.test_qpid_3481_acquired_to_alt_exchange #QPID-3597 Headers exchange issues -qpid_tests.broker_0_10.exchange.RecommendedTypesRuleTests.testHeaders -qpid_tests.broker_0_10.exchange.RequiredInstancesRuleTests.testAmqMatch qpid_tests.broker_0_10.query.QueryTests.test_exchange_bound_header #QPID-3599 Tests fail due to differences in expected message Redelivered status |