summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2014-12-17 14:29:50 +0000
committerGordon Sim <gsim@apache.org>2014-12-17 14:29:50 +0000
commitb2e043b69e7049c31fb0a75bb3e41f2550223a24 (patch)
treec6045bdb2c42412cb02cc9e477348e3d8fefd01c /qpid/cpp/src
parentfaec291315dc851eefa59b63f3c7107888b75f98 (diff)
downloadqpid-python-b2e043b69e7049c31fb0a75bb3e41f2550223a24.tar.gz
QPID-6275: reduce default autodelete timeout for durable subscriptions
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1646261 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp2
-rw-r--r--qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
index 920dd4172b..6128f4c0fc 100644
--- a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
@@ -547,7 +547,7 @@ Subscription::Subscription(const Address& address, const std::string& type)
//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_timeout", 15*60);
+ queueOptions.setInt("qpid.auto_delete_timeout", 2*60);
}
(Opt(address)/LINK/X_DECLARE/ARGUMENTS).collect(queueOptions);
(Opt(address)/LINK/X_SUBSCRIBE/ARGUMENTS).collect(subscriptionOptions);
diff --git a/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
index c6ad8cdb6c..e631501977 100644
--- a/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
@@ -242,7 +242,7 @@ bool replace(Variant::Map& map, const std::string& original, const std::string&
}
}
-const uint32_t DEFAULT_DURABLE_TIMEOUT(15*60);//15 minutes
+const uint32_t DEFAULT_DURABLE_TIMEOUT(2*60);//2 minutes
const uint32_t DEFAULT_TIMEOUT(0);
}