Author: rgodfrey
Date: Thu Jan 3 06:24:34 2008
New Revision: 608497
URL: http://svn.apache.org/viewvc?rev=608497&view=rev
Log:
QPID-716 : pass in generated Queue Name
Modified:
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
Modified:
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java?rev=608497&r1=608496&r2=608497&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
(original)
+++
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
Thu Jan 3 06:24:34 2008
@@ -82,7 +82,7 @@
// if we aren't given a queue name, we create one which we return to
the client
- if (body.getQueue() == null)
+ if ((body.getQueue() == null) || (body.getQueue().length() == 0))
{
queueName = createName();
}
@@ -109,7 +109,7 @@
}
else
{
- queue = createQueue(body, virtualHost, session);
+ queue = createQueue(queueName,body, virtualHost, session);
if (queue.isDurable() && !queue.isAutoDelete())
{
store.createQueue(queue);
@@ -161,13 +161,16 @@
return new AMQShortString("tmp_" + UUID.randomUUID());
}
- protected AMQQueue createQueue(QueueDeclareBody body, VirtualHost
virtualHost, final AMQProtocolSession session)
+ protected AMQQueue createQueue(final AMQShortString queueName,
+ QueueDeclareBody body,
+ VirtualHost virtualHost,
+ final AMQProtocolSession session)
throws AMQException
{
final QueueRegistry registry = virtualHost.getQueueRegistry();
AMQShortString owner = body.getExclusive() ? session.getContextKey() :
null;
- final AMQQueue queue = new AMQQueue(body.getQueue(),
body.getDurable(), owner, body.getAutoDelete(), virtualHost);
- final AMQShortString queueName = queue.getName();
+ final AMQQueue queue = new AMQQueue(queueName, body.getDurable(),
owner, body.getAutoDelete(), virtualHost);
+
if (body.getExclusive() && !body.getDurable())
{
