svn commit: r499872 - /incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java

[ritchiem]

Author: ritchiem
Date: Thu Jan 25 10:00:54 2007
New Revision: 499872

URL: http://svn.apache.org/viewvc?view=rev&rev=499872
Log:
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



Modified:
    
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java

Modified: 
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java?view=diff&rev=499872&r1=499871&r2=499872
==============================================================================
--- 
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
 (original)
+++ 
incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
 Thu Jan 25 10:00:54 2007
@@ -106,10 +106,10 @@
             // 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 @@
     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);
     }
 }