From 08e3441112ef89e037c1353adf7ccd0fa71806d6 Mon Sep 17 00:00:00 2001 From: "Carl C. Trieloff" Date: Wed, 21 Nov 2007 22:45:14 +0000 Subject: - set default to pre-acquire for acquire mode git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@597237 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/client/SubscriptionManager.cpp | 2 +- qpid/cpp/src/qpid/client/SubscriptionManager.h | 4 ++-- qpid/cpp/src/tests/perftest.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/qpid/client/SubscriptionManager.cpp b/qpid/cpp/src/qpid/client/SubscriptionManager.cpp index c482c824f7..3fbd45560c 100644 --- a/qpid/cpp/src/qpid/client/SubscriptionManager.cpp +++ b/qpid/cpp/src/qpid/client/SubscriptionManager.cpp @@ -35,7 +35,7 @@ namespace client { SubscriptionManager::SubscriptionManager(Session_0_10& s) : dispatcher(s), session(s), messages(UNLIMITED), bytes(UNLIMITED), window(true), - confirmMode(true), acquireMode(true) + confirmMode(true), acquireMode(false) {} void SubscriptionManager::subscribeInternal( diff --git a/qpid/cpp/src/qpid/client/SubscriptionManager.h b/qpid/cpp/src/qpid/client/SubscriptionManager.h index f163360f5d..ad5ddfa000 100644 --- a/qpid/cpp/src/qpid/client/SubscriptionManager.h +++ b/qpid/cpp/src/qpid/client/SubscriptionManager.h @@ -108,8 +108,8 @@ public: */ void setConfirmMode(bool confirm); - /** Set the acquire-mode for new subscriptions. Defaults to true. - *@param acquire: if false messages are not dequed, if true + /** Set the acquire-mode for new subscriptions. Defaults to false. + *@param acquire: if false messages pre-acquired, if true * messages are dequed on acknowledgement or on transfer * depending on confirmMode. */ diff --git a/qpid/cpp/src/tests/perftest.cpp b/qpid/cpp/src/tests/perftest.cpp index c7e3940086..78712aec5c 100644 --- a/qpid/cpp/src/tests/perftest.cpp +++ b/qpid/cpp/src/tests/perftest.cpp @@ -55,7 +55,7 @@ struct Opts : public TestOptions { listen(false), publish(false), purge(false), count(500000), size(64), consumers(1), mode("shared"), autoAck(100), - summary(false), confirmMode(false), acquireMode(true) + summary(false), confirmMode(false), acquireMode(false) { addOptions() ("listen", optValue(listen), "Consume messages.") @@ -69,7 +69,7 @@ struct Opts : public TestOptions { ("auto-ack", optValue(autoAck, "N"), "ack every N messages.") ("summary,s", optValue(summary), "summary output only") ("confirm-mode", optValue(confirmMode, "N"), "confirm mode") - ("acquire-mode", optValue(acquireMode, "Y"), "acquire mode"); + ("acquire-mode", optValue(acquireMode, "N"), "acquire mode (N - pre acquire, Y - no acquire"); } }; -- cgit v1.2.1