Repository: activemq-artemis Updated Branches: refs/heads/master 54e9d67b9 -> a20d7a033
ARTEMIS-2142 Patch Fix ServerJMSMessage for JMSXGROUPSEQ This is a patch fix for JMSXGROUPSEQ. Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/14451a79 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/14451a79 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/14451a79 Branch: refs/heads/master Commit: 14451a79eb11294dec6571bf54fe8da84446e931 Parents: 54e9d67 Author: Michael André Pearce <michael.andre.pea...@me.com> Authored: Fri Nov 9 14:57:20 2018 +0000 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Wed Nov 14 09:54:28 2018 -0500 ---------------------------------------------------------------------- .../apache/activemq/artemis/core/message/impl/CoreMessage.java | 3 +-- .../artemis/protocol/amqp/converter/jms/ServerJMSMessage.java | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/14451a79/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java index d716559..a1e86f5 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java @@ -291,8 +291,7 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage { @Override public int getGroupSequence() { - final Integer integer = this.getIntProperty(Message.HDR_GROUP_SEQUENCE); - return integer == null ? 0 : integer; + return containsProperty(Message.HDR_GROUP_SEQUENCE) ? getIntProperty(Message.HDR_GROUP_SEQUENCE) : 0; } /** http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/14451a79/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/jms/ServerJMSMessage.java ---------------------------------------------------------------------- diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/jms/ServerJMSMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/jms/ServerJMSMessage.java index 0ef2041..51e8adc 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/jms/ServerJMSMessage.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/jms/ServerJMSMessage.java @@ -266,7 +266,11 @@ public class ServerJMSMessage implements Message { @Override public final int getIntProperty(String name) throws JMSException { - return message.getIntProperty(name); + if (MessageUtil.JMSXGROUPSEQ.equals(name)) { + return message.getGroupSequence(); + } else { + return message.getIntProperty(name); + } } @Override
