From 19390150fee5ee716a67ffa707b65f3291a07ed8 Mon Sep 17 00:00:00 2001 From: Shailendra Kumar Singh Date: Tue, 2 Jan 2018 16:37:13 +0530 Subject: [PATCH 1/2] [ARTEMIS-1577] Address-settings policies aren't being applied when using an older version of JMS client --- .../artemis/core/message/impl/CoreMessage.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) 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 b0656b6926f..990799b4d49 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 @@ -49,6 +49,8 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage { public static final int BUFFER_HEADER_SPACE = PacketImpl.PACKET_HEADERS_SIZE; + public static final SimpleString OLD_QUEUE_PREFIX = new SimpleString("jms.queue."); + public static final SimpleString OLD_TOPIC_PREFIX = new SimpleString("jms.topic."); private volatile int memoryEstimate = -1; @@ -434,7 +436,7 @@ public CoreMessage setAddress(SimpleString address) { @Override public SimpleString getAddressSimpleString() { - return address; + return convertName(address); } @Override @@ -1111,4 +1113,18 @@ private static String toDate(long timestamp) { return new java.util.Date(timestamp).toString(); } } + + public SimpleString convertName(SimpleString name) { + if (name == null) { + return null; + } + + if (name.startsWith(OLD_QUEUE_PREFIX)) { + return name.subSeq(OLD_QUEUE_PREFIX.length(), name.length()); + } else if (name.startsWith(OLD_TOPIC_PREFIX)) { + return name.subSeq(OLD_TOPIC_PREFIX.length(), name.length()); + } else { + return name; + } + } } From 0842b3d5fa5862fc703c9c8c547c6baa2e11a4d4 Mon Sep 17 00:00:00 2001 From: Shailendra Kumar Singh Date: Tue, 2 Jan 2018 17:08:42 +0530 Subject: [PATCH 2/2] [ARTEMIS-1577]Indentation changes --- .../core/message/impl/CoreMessage.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) 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 990799b4d49..12e02d99b03 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 @@ -1115,16 +1115,16 @@ private static String toDate(long timestamp) { } public SimpleString convertName(SimpleString name) { - if (name == null) { - return null; - } - - if (name.startsWith(OLD_QUEUE_PREFIX)) { - return name.subSeq(OLD_QUEUE_PREFIX.length(), name.length()); - } else if (name.startsWith(OLD_TOPIC_PREFIX)) { - return name.subSeq(OLD_TOPIC_PREFIX.length(), name.length()); - } else { - return name; - } - } + if (name == null) { + return null; + } + + if (name.startsWith(OLD_QUEUE_PREFIX)) { + return name.subSeq(OLD_QUEUE_PREFIX.length(), name.length()); + } else if (name.startsWith(OLD_TOPIC_PREFIX)) { + return name.subSeq(OLD_TOPIC_PREFIX.length(), name.length()); + } else { + return name; + } + } }