qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r1291719 - in /qpid/trunk/qpid/java: common/src/main/java/org/apache/qpid/transport/network/Assembler.java test-profiles/python_tests/Java010PythonExcludes
Date Tue, 21 Feb 2012 11:38:01 GMT
Author: rgodfrey
Date: Tue Feb 21 11:38:00 2012
New Revision: 1291719

URL: http://svn.apache.org/viewvc?rev=1291719&view=rev
Log:
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)

Modified:
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
    qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes

Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java?rev=1291719&r1=1291718&r2=1291719&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
(original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
Tue Feb 21 11:38:00 2012
@@ -189,7 +189,7 @@ public class Assembler implements Receiv
             command = Method.create(commandType);
             command.setSync((0x0001 & hdr) != 0);
             command.read(dec);
-            if (command.hasPayload())
+            if (command.hasPayload() && !frame.isLastSegment())
             {
                 setIncompleteCommand(channel, command);
             }

Modified: qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes?rev=1291719&r1=1291718&r2=1291719&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes (original)
+++ qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes Tue Feb 21 11:38:00
2012
@@ -78,8 +78,6 @@ qpid_tests.broker_0_10.alternate_exchang
 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



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message