You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2007/09/24 17:25:52 UTC
svn commit: r578850 - in /incubator/qpid/branches/M2: ./
java/broker/src/main/java/org/apache/qpid/server/handler/
java/client/src/main/java/org/apache/qpid/client/
java/client/src/main/java/org/apache/qpid/client/protocol/
java/client/src/test/java/or...
Author: rgodfrey
Date: Mon Sep 24 08:25:51 2007
New Revision: 578850
URL: http://svn.apache.org/viewvc?rev=578850&view=rev
Log:
Merged revisions 578845 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
........
r578845 | rgodfrey | 2007-09-24 15:57:05 +0100 (Mon, 24 Sep 2007) | 1 line
QPID-612 : Use same scheme for every creation of temporary queue names
........
Removed:
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
Modified:
incubator/qpid/branches/M2/ (props changed)
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
Propchange: incubator/qpid/branches/M2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep 24 08:25:51 2007
@@ -1 +1 @@
-/incubator/qpid/branches/M2.1:400000-567005,568919,568924,573502,573516,574874,574902,575738,575788,575811,577941,578058
+/incubator/qpid/branches/M2.1:400000-567005,568919,568924,573502,573516,574874,574902,575738,575788,575811,577941,578058,578845
Modified: incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java?rev=578850&r1=578849&r2=578850&view=diff
==============================================================================
--- incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java (original)
+++ incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java Mon Sep 24 08:25:51 2007
@@ -22,6 +22,7 @@
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 @@
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)
Modified: incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java?rev=578850&r1=578849&r2=578850&view=diff
==============================================================================
--- incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java (original)
+++ incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java Mon Sep 24 08:25:51 2007
@@ -24,6 +24,7 @@
import javax.jms.JMSException;
import javax.jms.TemporaryTopic;
+import java.util.UUID;
/**
* AMQ implementation of TemporaryTopic.
@@ -38,7 +39,7 @@
*/
public AMQTemporaryTopic(AMQSession session)
{
- super(session.getTemporaryTopicExchangeName(),new AMQShortString("TempQueue" + Long.toString(System.currentTimeMillis())));
+ super(session.getTemporaryTopicExchangeName(),new AMQShortString("tmp_" + UUID.randomUUID()));
_session = session;
}
Modified: incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java?rev=578850&r1=578849&r2=578850&view=diff
==============================================================================
--- incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java (original)
+++ incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java Mon Sep 24 08:25:51 2007
@@ -53,6 +53,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import java.util.UUID;
/**
* Wrapper for protocol session that provides type-safe access to session attributes. <p/> The underlying protocol
@@ -411,14 +412,8 @@
protected AMQShortString generateQueueName()
{
int id;
- synchronized (_queueIdLock)
- {
- id = _queueId++;
- }
- // get rid of / and : and ; from address for spec conformance
- String localAddress = StringUtils.replaceChars(_minaProtocolSession.getLocalAddress().toString(), "/;:", "");
- return new AMQShortString("tmp_" + localAddress + "_" + id);
+ return new AMQShortString("tmp_" + UUID.randomUUID());
}
/** @param delay delay in seconds (not ms) */