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

Removing Marshalled property from Openwire

This commit is contained in:
Clebert Suconic 2016-04-20 22:32:24 -04:00
parent 1f586eaecb
commit 31055b6f0a
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
View File

@ -90,8 +90,6 @@ public class OpenWireMessageConverter implements MessageConverter {
private static final String AMQ_MSG_MARSHALL_PROP = AMQ_PREFIX + "MARSHALL_PROP";
private static final String AMQ_MSG_REPLY_TO = AMQ_PREFIX + "REPLY_TO";
private static final String AMQ_MSG_CONSUMER_ID = AMQ_PREFIX + "CONSUMER_ID";
private static final String AMQ_MSG_TX_ID = AMQ_PREFIX + "TX_ID";
private static final String AMQ_MSG_USER_ID = AMQ_PREFIX + "USER_ID";
private static final String AMQ_MSG_DROPPABLE = AMQ_PREFIX + "DROPPABLE";
@ -382,17 +380,6 @@ public class OpenWireMessageConverter implements MessageConverter {
ConsumerId consumerId = messageSend.getTargetConsumerId();
if (consumerId != null) {
ByteSequence consumerIdBytes = marshaller.marshal(consumerId);
consumerIdBytes.compact();
coreMessage.putBytesProperty(AMQ_MSG_CONSUMER_ID, consumerIdBytes.data);
}
TransactionId txId = messageSend.getTransactionId();
if (txId != null) {
ByteSequence txIdBytes = marshaller.marshal(txId);
txIdBytes.compact();
coreMessage.putBytesProperty(AMQ_MSG_TX_ID, txIdBytes.data);
}
String userId = messageSend.getUserID();
if (userId != null) {
@ -769,17 +756,6 @@ public class OpenWireMessageConverter implements MessageConverter {
amqMsg.setReplyTo(replyTo);
}
byte[] consumerIdBytes = (byte[]) coreMessage.getObjectProperty(AMQ_MSG_CONSUMER_ID);
if (consumerIdBytes != null) {
ConsumerId consumerId = (ConsumerId) marshaller.unmarshal(new ByteSequence(consumerIdBytes));
amqMsg.setTargetConsumerId(consumerId);
}
byte[] txIdBytes = (byte[]) coreMessage.getObjectProperty(AMQ_MSG_TX_ID);
if (txIdBytes != null) {
TransactionId txId = (TransactionId) marshaller.unmarshal(new ByteSequence(txIdBytes));
amqMsg.setTransactionId(txId);
}
String userId = (String) coreMessage.getObjectProperty(AMQ_MSG_USER_ID);
if (userId != null) {