Github user gemmellr commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/1337#discussion_r121921232
--- Diff:
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
---
@@ -733,20 +734,31 @@ private static boolean hasCapabilities(Symbol symbol,
Source source) {
return false;
}
- private static String createQueueName(String clientId,
+ private static String createQueueName(boolean useLegacyQueueNaming,
+ String clientId,
String pubId,
boolean shared,
boolean global,
boolean isVolatile) {
- String queue = clientId == null || clientId.isEmpty() || global ?
pubId : clientId + "." + pubId;
- if (shared) {
- if (queue.contains("|")) {
- queue = queue.split("\\|")[0];
- }
- if (isVolatile) {
- queue = "nonDurable" + "." + queue;
+ if (useLegacyQueueNaming) {
+ String queue = clientId == null || clientId.isEmpty() ? pubId :
clientId + "." + pubId;
--- End diff --
Ok. I think we should instead leave the fix (checking the global flag and
not adding the container-id to the queue name) in place to still resolve the
original bug. Its that or raising another PR to put it back in after taking it
back out in this one.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
