diff options
| author | Pavel Moravec <pmoravec@apache.org> | 2014-03-04 14:50:53 +0000 |
|---|---|---|
| committer | Pavel Moravec <pmoravec@apache.org> | 2014-03-04 14:50:53 +0000 |
| commit | 005a7541e991aa5fde879ffab58292d33f36011f (patch) | |
| tree | ae294250165c9df162ffb953af1e184d3ae2aed0 | |
| parent | 887d945f4327230bdc079e49598711a4dd516c0b (diff) | |
| download | qpid-python-005a7541e991aa5fde879ffab58292d33f36011f.tar.gz | |
QPID-5597: [C++ client] Topic subscriptions should not ignore auto-delete x-declare flag
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1574119 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp index 2effe4a115..08dff111b3 100644 --- a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp +++ b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp @@ -245,6 +245,7 @@ class Subscription : public Exchange, public MessageSource const bool reliable; const std::string actualType; const bool exclusiveQueue; + const bool autoDeleteQueue; const bool exclusiveSubscription; const std::string alternateExchange; FieldTable queueOptions; @@ -523,6 +524,7 @@ Subscription::Subscription(const Address& address, const std::string& type) reliable(durable ? !AddressResolution::is_unreliable(address) : AddressResolution::is_reliable(address)), actualType(type.empty() ? (specifiedType.empty() ? TOPIC_EXCHANGE : specifiedType) : type), exclusiveQueue((Opt(address)/LINK/X_DECLARE/EXCLUSIVE).asBool(true)), + autoDeleteQueue((Opt(address)/LINK/X_DECLARE/AUTO_DELETE).asBool(true)), exclusiveSubscription((Opt(address)/LINK/X_SUBSCRIBE/EXCLUSIVE).asBool(exclusiveQueue)), alternateExchange((Opt(address)/LINK/X_DECLARE/ALTERNATE_EXCHANGE).str()) { @@ -597,7 +599,7 @@ void Subscription::subscribe(qpid::client::AsyncSession& session, const std::str //create subscription queue: session.queueDeclare(arg::queue=queue, arg::exclusive=exclusiveQueue, - arg::autoDelete=!(durable || reliable), arg::durable=durable, + arg::autoDelete=autoDeleteQueue && (!(durable || reliable)), arg::durable=durable, arg::alternateExchange=alternateExchange, arg::arguments=queueOptions); //'default' binding: |