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

This commit is contained in:
Clebert Suconic 2018-05-21 17:59:20 -04:00
parent 07197b8c15 4b04b53bc9
commit 9eed307cee
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
View File

@ -970,7 +970,6 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
public Pair<RoutingContext, Message> redistribute(final Message message, public Pair<RoutingContext, Message> redistribute(final Message message,
final Queue originatingQueue, final Queue originatingQueue,
final Transaction tx) throws Exception { final Transaction tx) throws Exception {
Bindings bindings = addressManager.getBindingsForRoutingAddress(originatingQueue.getAddress()); Bindings bindings = addressManager.getBindingsForRoutingAddress(originatingQueue.getAddress());
if (bindings != null && bindings.allowRedistribute()) { if (bindings != null && bindings.allowRedistribute()) {
@ -978,6 +977,10 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
// arrived the target node // arrived the target node
// as described on https://issues.jboss.org/browse/JBPAPP-6130 // as described on https://issues.jboss.org/browse/JBPAPP-6130
Message copyRedistribute = message.copy(storageManager.generateID()); Message copyRedistribute = message.copy(storageManager.generateID());
if (copyRedistribute.getAddress() == null) {
copyRedistribute.setAddress(originatingQueue.getAddress());
}
if (tx != null) { if (tx != null) {
tx.addOperation(new TransactionOperationAbstract() { tx.addOperation(new TransactionOperationAbstract() {
@Override @Override