Repository: activemq-artemis Updated Branches: refs/heads/master eb75a69bc -> d5ebe071a
re-adding code accidently removed Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1530ea30 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1530ea30 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1530ea30 Branch: refs/heads/master Commit: 1530ea3032ac4c922dd1c0c5615bce00433412fb Parents: eb75a69 Author: Andy Taylor <[email protected]> Authored: Wed Apr 27 07:26:55 2016 +0100 Committer: Andy Taylor <[email protected]> Committed: Wed Apr 27 07:26:55 2016 +0100 ---------------------------------------------------------------------- .../protocol/proton/plug/ProtonSessionIntegrationCallback.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1530ea30/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java ---------------------------------------------------------------------- diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java index ccd2b7e..6a93df0 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java @@ -304,6 +304,10 @@ public class ProtonSessionIntegrationCallback implements AMQPSessionCallback, Se EncodedMessage encodedMessage = new EncodedMessage(messageFormat, messageEncoded.array(), messageEncoded.arrayOffset(), messageEncoded.writerIndex()); ServerMessage message = manager.getConverter().inbound(encodedMessage); + //use the address on the receiver if not null, if null let's hope it was set correctly on the message + if (address != null) { + message.setAddress(new SimpleString(address)); + } recoverContext();
