QPID-612 : Use same scheme for every creation of temporary queue names

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@578845 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 6 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
index 2bc185cfb4..29697542be 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
@@ -22,6 +22,7 @@ package org.apache.qpid.server.handler;
 
 import java.text.MessageFormat;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.UUID;
 
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
@@ -158,12 +159,7 @@ public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclar
 
     protected AMQShortString createName()
     {
-        return new AMQShortString("tmp_" + pad(_counter.incrementAndGet()));
-    }
-
-    protected static String pad(int value)
-    {
-        return MessageFormat.format("{0,number,0000000000000}", value);
+        return new AMQShortString("tmp_" + UUID.randomUUID());
     }
 
     protected AMQQueue createQueue(QueueDeclareBody body, VirtualHost virtualHost, final AMQProtocolSession session)