From f58d7486d9925b887d0f9ef9f55658a1b288cc64 Mon Sep 17 00:00:00 2001 From: Martyn Taylor Date: Tue, 27 Sep 2016 12:04:44 +0100 Subject: [PATCH 1/2] Use . separator for clientId.subId in AMQP --- .../proton/plug/context/server/ProtonServerSenderContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java index e9bd1236e34..2c3f875a2ed 100644 --- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java +++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java @@ -162,7 +162,7 @@ public void initialise() throws Exception { // Attempt to recover a previous subscription happens when a link reattach happens on a subscription queue String clientId = connection.getRemoteContainer(); String pubId = sender.getName(); - queue = clientId + ":" + pubId; + queue = clientId + "." + pubId; boolean exists = sessionSPI.queueQuery(queue, false).isExists(); /* From 4b5f04f846bc0b5d9631d192635cb3b7d8420783 Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Tue, 27 Sep 2016 13:59:10 +0200 Subject: [PATCH 2/2] Add function for creating queue name --- .../plug/context/server/ProtonServerSenderContext.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java index 2c3f875a2ed..210d252318f 100644 --- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java +++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java @@ -162,7 +162,7 @@ public void initialise() throws Exception { // Attempt to recover a previous subscription happens when a link reattach happens on a subscription queue String clientId = connection.getRemoteContainer(); String pubId = sender.getName(); - queue = clientId + "." + pubId; + queue = createQueueName(clientId, pubId); boolean exists = sessionSPI.queueQuery(queue, false).isExists(); /* @@ -205,7 +205,7 @@ public void initialise() throws Exception { TerminusDurability.CONFIGURATION.equals(source.getDurable())) { String clientId = connection.getRemoteContainer(); String pubId = sender.getName(); - queue = clientId + ":" + pubId; + queue = createQueueName(clientId, pubId); QueueQueryResult result = sessionSPI.queueQuery(queue, false); if (result.isExists()) { @@ -311,7 +311,7 @@ public void close(boolean remoteLinkClose) throws ActiveMQAMQPException { else { String clientId = connection.getRemoteContainer(); String pubId = sender.getName(); - String queue = clientId + ":" + pubId; + String queue = createQueueName(clientId, pubId); result = sessionSPI.queueQuery(queue, false); if (result.isExists()) { if (result.getConsumerCount() > 0) { @@ -449,4 +449,8 @@ private static boolean hasCapabilities(Symbol symbol, Source source) { return false; } + private static String createQueueName(String clientId, String pubId) { + return clientId + "." + pubId; + } + }