summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorPavel Moravec <pmoravec@apache.org>2014-06-24 10:36:36 +0000
committerPavel Moravec <pmoravec@apache.org>2014-06-24 10:36:36 +0000
commitffe75d935743d15d313ee2e81aae7854a0a3cd05 (patch)
treef16b3ae6b9774610f00b6a071510fb9aafa61c48 /qpid/cpp/src
parentf51edb405eb1d41dd6f8d81a93e4424a751b87ba (diff)
downloadqpid-python-ffe75d935743d15d313ee2e81aae7854a0a3cd05.tar.gz
QPID-5839: [C++ broker] Broker does not set lifetime-policy in AMQP1.0 attach performative
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1605051 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp b/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp
index 3d63d4c8c1..500a0c042d 100644
--- a/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp
@@ -128,7 +128,7 @@ void NodeProperties::write(pn_data_t* data, boost::shared_ptr<Queue> node)
pn_data_put_symbol(data, convert(SUPPORTED_DIST_MODES));
pn_data_put_string(data, convert(MOVE));//TODO: should really add COPY as well, since queues can be browsed
pn_bytes_t symbol;
- if (wasSpecified(AUTO_DELETE) && node->isAutoDelete() && getLifetimeDescriptorSymbol(node->getSettings().lifetime, symbol)) {
+ if ((wasSpecified(AUTO_DELETE) || wasSpecified(LIFETIME_POLICY)) && node->isAutoDelete() && getLifetimeDescriptorSymbol(node->getSettings().lifetime, symbol)) {
pn_data_put_symbol(data, convert(LIFETIME_POLICY));
pn_data_put_described(data);
pn_data_enter(data);