summaryrefslogtreecommitdiff
path: root/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
commitb24ee48481a0caec9a951baf60e2d9beb6304fc0 (patch)
tree0601638c71b83ca7cb6c5992e98ede827d2a058c /cpp/src
parent4fea24a0ef3b77d3fc38deb987c67e5fafa41732 (diff)
downloadqpid-python-b24ee48481a0caec9a951baf60e2d9beb6304fc0.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/qpid@1605051 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/broker/amqp/NodeProperties.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/qpid/broker/amqp/NodeProperties.cpp b/cpp/src/qpid/broker/amqp/NodeProperties.cpp
index 3d63d4c8c1..500a0c042d 100644
--- a/cpp/src/qpid/broker/amqp/NodeProperties.cpp
+++ b/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);