diff options
| author | Alan Conway <aconway@apache.org> | 2014-04-07 21:22:55 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2014-04-07 21:22:55 +0000 |
| commit | a6f044f40d70b73c320cc909169e3518909365e2 (patch) | |
| tree | a23df30ce4b52f1d23e55a0afa0e90c1fa20ffd6 /qpid/cpp/src/qpid/broker/Queue.h | |
| parent | 8ea0f79d78edd0a0825547ecc618e3fa63a2b93f (diff) | |
| download | qpid-python-a6f044f40d70b73c320cc909169e3518909365e2.tar.gz | |
QPID-5560: HA tests do not use AMQP 1.0
The HA tests were using only AMQP 0-10.
Modified the tests to use AMQP 1.0 if available (still use 0-10 if 1.0 is not available)
Fixed bugs uncovered both in the tests and in the AMQP 1.0 implementation.
Summary of changes:
- brokertest.py: configurable support for of swig vs. native and amqp0-10 vs. 1.0
- default to swig+amqp1.0 if swig is available, native+amqp0-10 otherwise
- qpidtoollibs/broker.py: enable use of swig client with BrokerAgent
- Swig python client:
- support for passing client_properties/properties.
- expose AddressHelper pn_data read/write as PnData helper class
- set sender/receiver capacity on creation
- limited disposition support - rejected messages.
- support for additional timeout parameters
- expose messaging::Logger, allow log configuration to be set from python.
- ha_tests.py:
- bind, delete policies not supported by AMQP 1.0, switched to using BrokerAgent QMF.
- pass protocol:amqp1.0 connection-option to c++ test clients (qpid-send, qpid-receive)
- TX tests forsce use of 0-10 protocol (but still with Swig client if enabled.)
- Broker fixes:
- Queue::Settings::isTemporary was set in the 0-10 SessionAdapter, moved to Broker::createQueue.
- broker::amqp::Session was always setting an exclusive owner in createQueue
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585588 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/broker/Queue.h')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Queue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h index 683468e9a4..c5996dd8be 100644 --- a/qpid/cpp/src/qpid/broker/Queue.h +++ b/qpid/cpp/src/qpid/broker/Queue.h @@ -363,7 +363,7 @@ class Queue : public boost::enable_shared_from_this<Queue>, * be created. */ QPID_BROKER_EXTERN void markInUse(bool controlling=false); - QPID_BROKER_EXTERN void releaseFromUse(bool controlling=false); + QPID_BROKER_EXTERN void releaseFromUse(bool controlling=false, bool doDelete=true); QPID_BROKER_EXTERN uint32_t purge(const uint32_t purge_request=0, //defaults to all messages boost::shared_ptr<Exchange> dest=boost::shared_ptr<Exchange>(), |