diff options
| author | Gordon Sim <gsim@apache.org> | 2014-12-17 14:29:19 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2014-12-17 14:29:19 +0000 |
| commit | 1412aadeb7b519f1f0bc19ac0274db32cb640ae7 (patch) | |
| tree | 9ac8dd2fe30583a6a81e86b3bb02e6c9579096fb /qpid | |
| parent | b5dba684ab72f5f8ea3e28672ba7e65668332dbc (diff) | |
| download | qpid-python-1412aadeb7b519f1f0bc19ac0274db32cb640ae7.tar.gz | |
QPID-6267: honour policy timeout even if it is 0
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1646256 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Session.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Session.cpp b/qpid/cpp/src/qpid/broker/amqp/Session.cpp index 85da8c0c21..32a923cac5 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Session.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/Session.cpp @@ -505,7 +505,7 @@ void Session::setupOutgoing(pn_link_t* link, pn_terminus_t* source, const std::s if (!settings.autodelete) settings.autodelete = autodelete; altExchange = node.topic->getAlternateExchange(); } - if (!settings.autoDeleteDelay) { + if (settings.original.find("qpid.auto_delete_timeout") == settings.original.end()) { //only use delay from link if policy didn't specify one settings.autoDeleteDelay = pn_terminus_get_timeout(source); settings.original["qpid.auto_delete_timeout"] = settings.autoDeleteDelay; |