From 9eb2bdc304b336ad8dd6b4bfb7e6bf94cf4bc9c0 Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Fri, 13 Aug 2010 13:57:09 +0000 Subject: QPID-2799: Convert address with underscores for temp queue name git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@985202 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/client/protocol/AMQProtocolSession.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'java/client/src') diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java index 07c36888cb..f0edd0d7bf 100644 --- a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java +++ b/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java @@ -385,10 +385,10 @@ public class AMQProtocolSession implements AMQVersionAwareProtocolSession { id = _queueId++; } - // get rid of / and : and ; from address for spec conformance - String localAddress = _protocolHandler.getLocalAddress().toString().replaceAll("[/;:]", ""); - - return new AMQShortString("tmp_" + localAddress + "_" + id); + // convert '.', '/', ':' and ';' to single '_', for spec compliance and readability + String localAddress = _protocolHandler.getLocalAddress().toString().replaceAll("[./:;]", "_"); + String queueName = "tmp_" + localAddress + "_" + id; + return new AMQShortString(queueName.replaceAll("_+", "_")); } public void confirmConsumerCancelled(int channelId, AMQShortString consumerTag) -- cgit v1.2.1