Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #631 ARTEMIS-629 Preserve the correlation ID type during conversions

This commit is contained in:
Andy Taylor 2016-07-14 10:08:55 +01:00
parent 1893d773a4 688eac50ea
commit d7edf06689
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/InboundTransformer.java
View File

@ -215,7 +215,7 @@ public abstract class InboundTransformer {
jms.setJMSReplyTo(vendor.createDestination(properties.getReplyTo())); jms.setJMSReplyTo(vendor.createDestination(properties.getReplyTo()));
} }
if (properties.getCorrelationId() != null) { if (properties.getCorrelationId() != null) {
jms.setJMSCorrelationID(properties.getCorrelationId().toString()); jms.setJMSCorrelationID(AMQPMessageIdHelper.INSTANCE.toBaseMessageIdString(properties.getCorrelationId()));
} }
if (properties.getContentType() != null) { if (properties.getContentType() != null) {
jms.setStringProperty(prefixVendor + "ContentType", properties.getContentType().toString()); jms.setStringProperty(prefixVendor + "ContentType", properties.getContentType().toString());

9
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/JMSMappingOutboundTransformer.java
View File

@ -176,7 +176,14 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
maMap.put(LEGACY_JMS_REPLY_TO_TYPE_MSG_ANNOTATION, destinationAttributes(msg.getJMSReplyTo())); maMap.put(LEGACY_JMS_REPLY_TO_TYPE_MSG_ANNOTATION, destinationAttributes(msg.getJMSReplyTo()));
} }
if (msg.getJMSCorrelationID() != null) { if (msg.getJMSCorrelationID() != null) {
props.setCorrelationId(msg.getJMSCorrelationID()); String correlationId = msg.getJMSCorrelationID();
try {
props.setCorrelationId(AMQPMessageIdHelper.INSTANCE.toIdObject(correlationId));
}
catch (ActiveMQAMQPIllegalStateException e) {
props.setCorrelationId(correlationId);
}
} }
if (msg.getJMSExpiration() != 0) { if (msg.getJMSExpiration() != 0) {
long ttl = msg.getJMSExpiration() - System.currentTimeMillis(); long ttl = msg.getJMSExpiration() - System.currentTimeMillis();