diff options
Diffstat (limited to 'cpp/src/qpid/broker/BrokerAdapter.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/BrokerAdapter.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cpp/src/qpid/broker/BrokerAdapter.cpp b/cpp/src/qpid/broker/BrokerAdapter.cpp index a0ab42592e..dc8cd6cce1 100644 --- a/cpp/src/qpid/broker/BrokerAdapter.cpp +++ b/cpp/src/qpid/broker/BrokerAdapter.cpp @@ -213,7 +213,7 @@ void BrokerAdapter::QueueHandlerImpl::declare(const MethodContext& context, uint std::pair<Queue::shared_ptr, bool> queue_created = broker.getQueues().declare( name, durable, - autoDelete ? connection.getTimeout() : 0, + autoDelete && !exclusive, exclusive ? &connection : 0); queue = queue_created.first; assert(queue); @@ -229,9 +229,6 @@ void BrokerAdapter::QueueHandlerImpl::declare(const MethodContext& context, uint //handle automatic cleanup: if (exclusive) { connection.exclusiveQueues.push_back(queue); - } else if(autoDelete){ - broker.getCleaner().add(queue); - broker.getCleaner().clean(); // check if cleaning is needed } } } |