QPID-5003: Use correct property for delayed auto-delete. Explicit 0 timeout should override default.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1646255 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 3 deletions

diff --git a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
index bbb310b0f4..920dd4172b 100644
--- a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
@@ -538,15 +538,16 @@ Subscription::Subscription(const Address& address, const std::string& type)
       exclusiveSubscription((Opt(address)/LINK/X_SUBSCRIBE/EXCLUSIVE).asBool(exclusiveQueue)),
       alternateExchange((Opt(address)/LINK/X_DECLARE/ALTERNATE_EXCHANGE).str())
 {
-    const Variant* timeout = (Opt(address)/LINK/TIMEOUT).value;
-    if (timeout) {
+
+    if ((Opt(address)/LINK).hasKey(TIMEOUT)) {
+        const Variant* timeout = (Opt(address)/LINK/TIMEOUT).value;
         if (timeout->asUint32()) queueOptions.setInt("qpid.auto_delete_timeout", timeout->asUint32());
     } else if (durable && !(Opt(address)/LINK/RELIABILITY).value) {
         //if durable but not explicitly reliable, then set a non-zero
         //default for the autodelete timeout (previously this would
         //have defaulted to autodelete immediately anyway, so the risk
         //of the change causing problems is mitigated)
-        queueOptions.setInt("qpid.auto_delete_delay", 15*60);
+        queueOptions.setInt("qpid.auto_delete_timeout", 15*60);
     }
     (Opt(address)/LINK/X_DECLARE/ARGUMENTS).collect(queueOptions);
     (Opt(address)/LINK/X_SUBSCRIBE/ARGUMENTS).collect(subscriptionOptions);