From d4b6143a73d60d3ade9b398b8d45c3ba495bc6ec Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Mon, 19 Jan 2015 14:13:00 +0000 Subject: QPID-6322: avoid setting qpid.auto_delete_timeout unnecessarily git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1653006 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/broker/amqp/Session.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/qpid/broker/amqp/Session.cpp b/qpid/cpp/src/qpid/broker/amqp/Session.cpp index 04a691e5d9..538883f29a 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Session.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/Session.cpp @@ -509,7 +509,8 @@ void Session::setupOutgoing(pn_link_t* link, pn_terminus_t* source, const std::s 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; + if (settings.autoDeleteDelay) + settings.original["qpid.auto_delete_timeout"] = settings.autoDeleteDelay; } if (settings.autoDeleteDelay) { settings.autodelete = true; -- cgit v1.2.1