Repository: activemq-artemis Updated Branches: refs/heads/master b63c8fa9a -> cafc42cc2
ARTEMIS-1009 fixing ProtonTest::testFilterJMSMessageID Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ce77d12b Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ce77d12b Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ce77d12b Branch: refs/heads/master Commit: ce77d12b8741bdd1218134819e00886df7ab3807 Parents: b63c8fa Author: Clebert Suconic <[email protected]> Authored: Tue Mar 7 09:29:04 2017 -0500 Committer: Clebert Suconic <[email protected]> Committed: Tue Mar 7 09:29:04 2017 -0500 ---------------------------------------------------------------------- .../activemq/artemis/protocol/amqp/broker/AMQPMessage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ce77d12b/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 813915d..1859dcf 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 @@ -398,8 +398,8 @@ public class AMQPMessage extends RefCountMessage { @Override public Object getUserID() { Properties properties = getProperties(); - if (properties != null && properties.getUserId() != null) { - return properties.getUserId(); + if (properties != null && properties.getMessageId() != null) { + return properties.getMessageId(); } else { return this; }
