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 #829

This commit is contained in:
Clebert Suconic 2016-10-10 09:55:16 +02:00
parent de746a7620 693e745b9c
commit 15f44d60df
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,7 +177,7 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
} }
properties.setTo(toAddress(destination)); properties.setTo(toAddress(destination));
if (maMap == null) { if (maMap == null) {
maMap = new HashMap<Symbol, Object>(); maMap = new HashMap<>();
} }
maMap.put(JMS_DEST_TYPE_MSG_ANNOTATION, destinationType(destination)); maMap.put(JMS_DEST_TYPE_MSG_ANNOTATION, destinationType(destination));
} }
@ -188,7 +188,7 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
} }
properties.setReplyTo(toAddress(replyTo)); properties.setReplyTo(toAddress(replyTo));
if (maMap == null) { if (maMap == null) {
maMap = new HashMap<Symbol, Object>(); maMap = new HashMap<>();
} }
maMap.put(JMS_REPLY_TO_TYPE_MSG_ANNOTATION, destinationType(replyTo)); maMap.put(JMS_REPLY_TO_TYPE_MSG_ANNOTATION, destinationType(replyTo));
} }
@ -293,14 +293,14 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
continue; continue;
} else if (key.startsWith(JMS_AMQP_DELIVERY_ANNOTATION_PREFIX)) { } else if (key.startsWith(JMS_AMQP_DELIVERY_ANNOTATION_PREFIX)) {
if (daMap == null) { if (daMap == null) {
daMap = new HashMap<Symbol, Object>(); daMap = new HashMap<>();
} }
String name = key.substring(JMS_AMQP_DELIVERY_ANNOTATION_PREFIX.length()); String name = key.substring(JMS_AMQP_DELIVERY_ANNOTATION_PREFIX.length());
daMap.put(Symbol.valueOf(name), message.getObjectProperty(key)); daMap.put(Symbol.valueOf(name), message.getObjectProperty(key));
continue; continue;
} else if (key.startsWith(JMS_AMQP_MESSAGE_ANNOTATION_PREFIX)) { } else if (key.startsWith(JMS_AMQP_MESSAGE_ANNOTATION_PREFIX)) {
if (maMap == null) { if (maMap == null) {
maMap = new HashMap<Symbol, Object>(); maMap = new HashMap<>();
} }
String name = key.substring(JMS_AMQP_MESSAGE_ANNOTATION_PREFIX.length()); String name = key.substring(JMS_AMQP_MESSAGE_ANNOTATION_PREFIX.length());
maMap.put(Symbol.valueOf(name), message.getObjectProperty(key)); maMap.put(Symbol.valueOf(name), message.getObjectProperty(key));
@ -325,7 +325,7 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
continue; continue;
} else if (key.startsWith(JMS_AMQP_FOOTER_PREFIX)) { } else if (key.startsWith(JMS_AMQP_FOOTER_PREFIX)) {
if (footerMap == null) { if (footerMap == null) {
footerMap = new HashMap<Object, Object>(); footerMap = new HashMap<>();
} }
String name = key.substring(JMS_AMQP_FOOTER_PREFIX.length()); String name = key.substring(JMS_AMQP_FOOTER_PREFIX.length());
footerMap.put(name, message.getObjectProperty(key)); footerMap.put(name, message.getObjectProperty(key));
@ -350,7 +350,7 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
} }
if (apMap == null) { if (apMap == null) {
apMap = new HashMap<String, Object>(); apMap = new HashMap<>();
} }
Object objectProperty = message.getObjectProperty(key); Object objectProperty = message.getObjectProperty(key);