diff options
| author | Gordon Sim <gsim@apache.org> | 2009-01-05 20:58:12 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2009-01-05 20:58:12 +0000 |
| commit | eccb49d13d707aad60ba839cc438d8050284a9f7 (patch) | |
| tree | 86b98ba2fa854a1a8468aec775343a253bacf079 /cpp/src | |
| parent | 6d0e02499ec8caea2c2559207185cb9e6174dd8d (diff) | |
| download | qpid-python-eccb49d13d707aad60ba839cc438d8050284a9f7.tar.gz | |
Sorry! Carelessly committed more than I wanted to. Reverting part of my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@731717 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/broker/DirectExchange.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/cpp/src/qpid/broker/DirectExchange.cpp b/cpp/src/qpid/broker/DirectExchange.cpp index d1d9ad07e4..2eb488de67 100644 --- a/cpp/src/qpid/broker/DirectExchange.cpp +++ b/cpp/src/qpid/broker/DirectExchange.cpp @@ -33,7 +33,6 @@ namespace const std::string qpidFedOp("qpid.fed.op"); const std::string qpidFedTags("qpid.fed.tags"); const std::string qpidFedOrigin("qpid.fed.origin"); -const std::string qpidExclusiveBinding("qpid.exclusive-binding"); const std::string fedOpBind("B"); const std::string fedOpUnbind("U"); @@ -57,25 +56,15 @@ DirectExchange::DirectExchange(const string& _name, bool _durable, bool DirectExchange::bind(Queue::shared_ptr queue, const string& routingKey, const FieldTable* args) { - string fedOp(fedOpBind); - string fedTags; - string fedOrigin; - bool exclusiveBinding = false; - if (args) { - fedOp = args->getAsString(qpidFedOp); - fedTags = args->getAsString(qpidFedTags); - fedOrigin = args->getAsString(qpidFedOrigin); - exclusiveBinding = args->get(qpidExclusiveBinding); - } - + string fedOp(args ? args->getAsString(qpidFedOp) : fedOpBind); + string fedTags(args ? args->getAsString(qpidFedTags) : ""); + string fedOrigin(args ? args->getAsString(qpidFedOrigin) : ""); bool propagate = false; if (args == 0 || fedOp.empty() || fedOp == fedOpBind) { Mutex::ScopedLock l(lock); Binding::shared_ptr b(new Binding(routingKey, queue, this, FieldTable(), fedOrigin)); BoundKey& bk = bindings[routingKey]; - if (exclusiveBinding) bk.queues.clear(); - if (bk.queues.add_unless(b, MatchQueue(queue))) { propagate = bk.fedBinding.addOrigin(fedOrigin); if (mgmtExchange != 0) { |