From ce77d12b8741bdd1218134819e00886df7ab3807 Mon Sep 17 00:00:00 2001
From: Clebert Suconic <clebertsuconic@apache.org>
Date: Tue, 7 Mar 2017 09:29:04 -0500
Subject: [PATCH] ARTEMIS-1009 fixing ProtonTest::testFilterJMSMessageID

---
 .../activemq/artemis/protocol/amqp/broker/AMQPMessage.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 813915d0925..1859dcfab03 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 AMQPMessage setExpiration(long expiration) {
    @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;
       }