diff options
| author | Carl C. Trieloff <cctrieloff@apache.org> | 2007-11-21 22:45:14 +0000 |
|---|---|---|
| committer | Carl C. Trieloff <cctrieloff@apache.org> | 2007-11-21 22:45:14 +0000 |
| commit | 1905d2aced75c087566c419dcb28776e36c39b3b (patch) | |
| tree | 7e2074735f3bdc140bd47975b1b0ffb91fd68b4b | |
| parent | 286ecd708ec48dc5622912bf43240e2660fadf2c (diff) | |
| download | qpid-python-1905d2aced75c087566c419dcb28776e36c39b3b.tar.gz | |
- set default to pre-acquire for acquire mode
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@597237 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/src/qpid/client/SubscriptionManager.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/client/SubscriptionManager.h | 4 | ||||
| -rw-r--r-- | cpp/src/tests/perftest.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/qpid/client/SubscriptionManager.cpp b/cpp/src/qpid/client/SubscriptionManager.cpp index c482c824f7..3fbd45560c 100644 --- a/cpp/src/qpid/client/SubscriptionManager.cpp +++ b/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/cpp/src/qpid/client/SubscriptionManager.h b/cpp/src/qpid/client/SubscriptionManager.h index f163360f5d..ad5ddfa000 100644 --- a/cpp/src/qpid/client/SubscriptionManager.h +++ b/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/cpp/src/tests/perftest.cpp b/cpp/src/tests/perftest.cpp index c7e3940086..78712aec5c 100644 --- a/cpp/src/tests/perftest.cpp +++ b/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"); } }; |