diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-01-25 18:00:54 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-01-25 18:00:54 +0000 |
| commit | f70f6e828ee07dcd537441051425f3d44405bb5f (patch) | |
| tree | 04d67bb27b7462463cecba5dc94c48b5bfa1c993 | |
| parent | 7b43a624880b97a0f4835ff41ba6037d5183e909 (diff) | |
| download | qpid-python-f70f6e828ee07dcd537441051425f3d44405bb5f.tar.gz | |
Revision: 499041
Author: rgreig
Date: 14:58:56, 23 January 2007
Message:
QPID-314 : Patch supplied by Rob Godfrey - treat non-durable exclusive queues as auto-delete
----
Modified : /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/perftesting@499872 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java index 83f98de2d9..ec97bac003 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java @@ -106,10 +106,10 @@ public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclar // TODO: Connect this to the session version obtained from ProtocolInitiation for this session. // Be aware of possible changes to parameter order as versions change. AMQFrame response = QueueDeclareOkBody.createAMQFrame(evt.getChannelId(), - (byte)8, (byte)0, // AMQP version (major, minor) - 0L, // consumerCount - 0L, // messageCount - body.queue); // queue + (byte) 8, (byte) 0, // AMQP version (major, minor) + 0L, // consumerCount + 0L, // messageCount + body.queue); // queue _log.info("Queue " + body.queue + " declared successfully"); protocolSession.writeFrame(response); } @@ -128,7 +128,7 @@ public class QueueDeclareHandler implements StateAwareMethodListener<QueueDeclar protected AMQQueue createQueue(QueueDeclareBody body, QueueRegistry registry, AMQProtocolSession session) throws AMQException { - String owner = body.exclusive ? session.getContextKey() : null; - return new AMQQueue(body.queue, body.durable, owner, body.autoDelete, registry); + String owner = body.exclusive ? session.getContextKey() : null; + return new AMQQueue(body.queue, body.durable, owner, body.autoDelete || (!body.durable && body.exclusive), registry); } } |