You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/12/11 17:32:12 UTC

[1/2] activemq-artemis git commit: ARTEMIS-1542 - AMQP message cluster-bridging fixi

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 64552367b -> c1bc7a30e


ARTEMIS-1542 - AMQP message cluster-bridging fixi

Fixing and issue where AMQP messages would lose their address when being sent accross a cluster-bridge.


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4ab664f7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4ab664f7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4ab664f7

Branch: refs/heads/master
Commit: 4ab664f796c0c6648a8fe55f58d54cc62b0d849d
Parents: 6455236
Author: todd <tb...@redhat.com>
Authored: Mon Dec 11 11:17:57 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Dec 11 12:31:54 2017 -0500

----------------------------------------------------------------------
 .../artemis/core/server/cluster/impl/ClusterConnectionBridge.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4ab664f7/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
index 5f70d28..7ebc273 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
@@ -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;
    }


[2/2] activemq-artemis git commit: This closes #1702

Posted by cl...@apache.org.
This closes #1702


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c1bc7a30
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c1bc7a30
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c1bc7a30

Branch: refs/heads/master
Commit: c1bc7a30e76152562aeb569186fe26dca70661b7
Parents: 6455236 4ab664f
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Dec 11 12:31:55 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Dec 11 12:31:55 2017 -0500

----------------------------------------------------------------------
 .../artemis/core/server/cluster/impl/ClusterConnectionBridge.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------