Author: rgodfrey
Date: Mon Nov 21 14:25:45 2016
New Revision: 1770691
URL: http://svn.apache.org/viewvc?rev=1770691&view=rev
Log:
QPID-7533 : Fix 0-10 message-id / correlation-id issue
Modified:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java
qpid/java/trunk/test-profiles/Java010Excludes
Modified:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java?rev=1770691&r1=1770690&r2=1770691&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java
Mon Nov 21 14:25:45 2016
@@ -75,7 +75,7 @@ class MessageTransferHeader implements A
{
UUID id = _messageProps == null ? null : _messageProps.getMessageId();
- return id == null ? null : String.valueOf(id);
+ return id == null ? null : "ID:"+String.valueOf(id);
}
public String getMimeType()
Modified: qpid/java/trunk/test-profiles/Java010Excludes
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java010Excludes?rev=1770691&r1=1770690&r2=1770691&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java010Excludes (original)
+++ qpid/java/trunk/test-profiles/Java010Excludes Mon Nov 21 14:25:45 2016
@@ -87,5 +87,3 @@ org.apache.qpid.test.unit.basic.Property
// There is no way in the 0-10 client to cause a send to fail when the message
does not reach any queue
org.apache.qpid.server.queue.NodeAutoCreationPolicyTest#testSendingToNonMatchingQueuePatternBURL
-// Temporarily exclude one management test which fails on correlation id
checking
-org.apache.qpid.systest.management.amqp.AmqpManagementTest#testGetTypesOnBrokerManagement
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
