activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/3] activemq-artemis git commit: ARTEMIS-1542 - AMQP message cluster-bridging fix
Date Mon, 11 Dec 2017 16:07:09 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master e19d827da -> 64552367b


ARTEMIS-1542 - AMQP message cluster-bridging fix

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/fcfa4a5e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/fcfa4a5e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/fcfa4a5e

Branch: refs/heads/master
Commit: fcfa4a5e636f34220434998ee7174e8f2086a43d
Parents: e19d827
Author: Todd Baert <toddbaert@gmail.com>
Authored: Sat Dec 9 15:50:52 2017 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Mon Dec 11 11:06:36 2017 -0500

----------------------------------------------------------------------
 .../activemq/artemis/protocol/amqp/broker/AMQPMessage.java     | 6 +++++-
 .../core/server/cluster/impl/ClusterConnectionBridge.java      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fcfa4a5e/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
index 2e06d2e..2bdd88a 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -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

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fcfa4a5e/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;
    }


Mime
View raw message