Skip to content

[ARTEMIS-1577] Address-settings policies aren't being applied when using an older version of JMS client #1744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shailendra14k wants to merge 2 commits into from
Closed

[ARTEMIS-1577] Address-settings policies aren't being applied when using an older version of JMS client #1744

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1939015
[ARTEMIS-1577] Address-settings policies aren't being applied when us…
shailendra14k Jan 2, 2018
0842b3d
[ARTEMIS-1577]Indentation changes
shailendra14k Jan 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion ...-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -434,7 +436,7 @@ public CoreMessage setAddress(SimpleString address) {

@Override
public SimpleString getAddressSimpleString() {
return address;
return convertName(address);
}

@Override
Expand Down Expand Up @@ -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;
}
}
}