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

ARTEMIS-1542 - AMQP message cluster-bridging fix 

Fixing and issue where AMQP messages would lose their address when being sent accross a cluster-bridge.
This commit is contained in:
Todd Baert 2017-12-09 15:50:52 -05:00 committed by Clebert Suconic
parent e19d827da4
commit fcfa4a5e63
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
View File

@ -608,7 +608,11 @@ public class AMQPMessage extends RefCountMessage {
@Override
public AMQPMessage setAddress(SimpleString address) {
return setAddress(address.toString());
if (address != null) {
return setAddress(address.toString());
} else {
return setAddress((String) null);
}
}
@Override

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
View File

@ -182,7 +182,7 @@ public class ClusterConnectionBridge extends BridgeImpl {
messageCopy.putExtraBytesProperty(Message.HDR_ROUTE_TO_IDS, queueIds);
messageCopy = super.beforeForward(messageCopy, null);
messageCopy = super.beforeForward(messageCopy, forwardingAddress);
return messageCopy;
}