You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2014/12/17 15:29:19 UTC

svn commit: r1646256 - /qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp

Author: gsim
Date: Wed Dec 17 14:29:19 2014
New Revision: 1646256

URL: http://svn.apache.org/r1646256
Log:
QPID-6267: honour policy timeout even if it is 0

Modified:
    qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp?rev=1646256&r1=1646255&r2=1646256&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp Wed Dec 17 14:29:19 2014
@@ -505,7 +505,7 @@ void Session::setupOutgoing(pn_link_t* l
             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;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org