Modified: qpid/branches/asyncstore/cpp/src/qpid/ha/QueueReplicator.h URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/ha/QueueReplicator.h?rev=1399662&r1=1399661&r2=1399662&view=diff ============================================================================== --- qpid/branches/asyncstore/cpp/src/qpid/ha/QueueReplicator.h (original) +++ qpid/branches/asyncstore/cpp/src/qpid/ha/QueueReplicator.h Thu Oct 18 13:37:42 2012 @@ -71,9 +71,8 @@ class QueueReplicator : public broker::E void deactivate(); // Call before dtor std::string getType() const; - bool bind(boost::shared_ptr<broker::Queue - >, const std::string&, const framing::FieldTable*); - bool unbind(boost::shared_ptr<broker::Queue>, const std::string&, const framing::FieldTable*); + bool bind(boost::shared_ptr<broker::Queue>, const std::string&, const framing::FieldTable*, qpid::broker::AsyncStore* const); + bool unbind(boost::shared_ptr<broker::Queue>, const std::string&, const framing::FieldTable*, qpid::broker::AsyncStore* const); void route(broker::Deliverable&); bool isBound(boost::shared_ptr<broker::Queue>, const std::string* const, const framing::FieldTable* const);
Modified: qpid/branches/asyncstore/cpp/src/qpid/management/ManagementTopicExchange.cpp URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/management/ManagementTopicExchange.cpp?rev=1399662&r1=1399661&r2=1399662&view=diff ============================================================================== --- qpid/branches/asyncstore/cpp/src/qpid/management/ManagementTopicExchange.cpp (original) +++ qpid/branches/asyncstore/cpp/src/qpid/management/ManagementTopicExchange.cpp Thu Oct 18 13:37:42 2012 @@ -53,11 +53,12 @@ void ManagementTopicExchange::route(Deli bool ManagementTopicExchange::bind(Queue::shared_ptr queue, const std::string& routingKey, - const qpid::framing::FieldTable* args) + const qpid::framing::FieldTable* args, + AsyncStore* const store) { if (qmfVersion == 1) managementAgent->clientAdded(routingKey); - return TopicExchange::bind(queue, routingKey, args); + return TopicExchange::bind(queue, routingKey, args, store); } void ManagementTopicExchange::setManagmentAgent(ManagementAgent* agent, int qv) Modified: qpid/branches/asyncstore/cpp/src/qpid/management/ManagementTopicExchange.h URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/management/ManagementTopicExchange.h?rev=1399662&r1=1399661&r2=1399662&view=diff ============================================================================== --- qpid/branches/asyncstore/cpp/src/qpid/management/ManagementTopicExchange.h (original) +++ qpid/branches/asyncstore/cpp/src/qpid/management/ManagementTopicExchange.h Thu Oct 18 13:37:42 2012 @@ -47,7 +47,8 @@ class ManagementTopicExchange : public v virtual bool bind(Queue::shared_ptr queue, const std::string& routingKey, - const qpid::framing::FieldTable* args); + const qpid::framing::FieldTable* args, + AsyncStore* const store); void setManagmentAgent(management::ManagementAgent* agent, int qmfVersion); Modified: qpid/branches/asyncstore/cpp/src/qpid/xml/XmlExchange.cpp URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/xml/XmlExchange.cpp?rev=1399662&r1=1399661&r2=1399662&view=diff ============================================================================== --- qpid/branches/asyncstore/cpp/src/qpid/xml/XmlExchange.cpp (original) +++ qpid/branches/asyncstore/cpp/src/qpid/xml/XmlExchange.cpp Thu Oct 18 13:37:42 2012 @@ -116,7 +116,7 @@ XmlExchange::XmlExchange(const std::stri mgmtExchange->set_type (typeName); } -bool XmlExchange::bind(Queue::shared_ptr queue, const std::string& bindingKey, const FieldTable* args) +bool XmlExchange::bind(Queue::shared_ptr queue, const std::string& bindingKey, const FieldTable* args, AsyncStore* const store) { // Federation uses bind for unbind and reorigin comands as well as for binds. @@ -136,7 +136,7 @@ bool XmlExchange::bind(Queue::shared_ptr } if (fedOp == fedOpUnbind) { - return fedUnbind(fedOrigin, fedTags, queue, bindingKey, args); + return fedUnbind(fedOrigin, fedTags, queue, bindingKey, args, store); } else if (fedOp == fedOpReorigin) { fedReorigin(); @@ -176,7 +176,7 @@ bool XmlExchange::bind(Queue::shared_ptr return true; } -bool XmlExchange::unbind(Queue::shared_ptr queue, const std::string& bindingKey, const FieldTable* args) +bool XmlExchange::unbind(Queue::shared_ptr queue, const std::string& bindingKey, const FieldTable* args, AsyncStore* const /*store*/) { /* * When called directly, no qpidFedOrigin argument will be @@ -383,11 +383,11 @@ void XmlExchange::propagateFedOp(const s Exchange::propagateFedOp(bindingKey, fedTags, fedOp, fedOrigin, propArgs); } -bool XmlExchange::fedUnbind(const std::string& fedOrigin, const std::string& fedTags, Queue::shared_ptr queue, const std::string& bindingKey, const FieldTable* args) +bool XmlExchange::fedUnbind(const std::string& fedOrigin, const std::string& fedTags, Queue::shared_ptr queue, const std::string& bindingKey, const FieldTable* args, AsyncStore* const store) { RWlock::ScopedRlock l(lock); - if (unbind(queue, bindingKey, args)) { + if (unbind(queue, bindingKey, args, store)) { propagateFedOp(bindingKey, fedTags, fedOpUnbind, fedOrigin); return true; } Modified: qpid/branches/asyncstore/cpp/src/qpid/xml/XmlExchange.h URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/qpid/xml/XmlExchange.h?rev=1399662&r1=1399661&r2=1399662&view=diff ============================================================================== --- qpid/branches/asyncstore/cpp/src/qpid/xml/XmlExchange.h (original) +++ qpid/branches/asyncstore/cpp/src/qpid/xml/XmlExchange.h Thu Oct 18 13:37:42 2012 @@ -76,9 +76,9 @@ class XmlExchange : public virtual Excha virtual std::string getType() const { return typeName; } - virtual bool bind(Queue::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args); + virtual bool bind(Queue::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args, AsyncStore* const store); - virtual bool unbind(Queue::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args); + virtual bool unbind(Queue::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args, AsyncStore* const store); virtual void route(Deliverable& msg); @@ -86,7 +86,7 @@ class XmlExchange : public virtual Excha virtual void propagateFedOp(const std::string& bindingKey, const std::string& fedTags, const std::string& fedOp, const std::string& fedOrigin, const qpid::framing::FieldTable* args=0); - virtual bool fedUnbind(const std::string& fedOrigin, const std::string& fedTags, Queue::shared_ptr queue, const std::string& bindingKey, const qpid::framing::FieldTable* args); + virtual bool fedUnbind(const std::string& fedOrigin, const std::string& fedTags, Queue::shared_ptr queue, const std::string& bindingKey, const qpid::framing::FieldTable* args, AsyncStore* const store); virtual void fedReorigin(); Modified: qpid/branches/asyncstore/cpp/src/tests/ExchangeTest.cpp URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/ExchangeTest.cpp?rev=1399662&r1=1399661&r2=1399662&view=diff ============================================================================== --- qpid/branches/asyncstore/cpp/src/tests/ExchangeTest.cpp (original) +++ qpid/branches/asyncstore/cpp/src/tests/ExchangeTest.cpp Thu Oct 18 13:37:42 2012 @@ -51,12 +51,12 @@ QPID_AUTO_TEST_CASE(testMe) Queue::shared_ptr queue2(new Queue("queue2", true)); TopicExchange topic("topic"); - topic.bind(queue, "abc", 0); - topic.bind(queue2, "abc", 0); + topic.bind(queue, "abc", 0, 0); + topic.bind(queue2, "abc", 0, 0); DirectExchange direct("direct"); - direct.bind(queue, "abc", 0); - direct.bind(queue2, "abc", 0); + direct.bind(queue, "abc", 0, 0); + direct.bind(queue2, "abc", 0, 0); queue.reset(); queue2.reset(); @@ -78,9 +78,9 @@ QPID_AUTO_TEST_CASE(testIsBound) string k3("xyz"); FanOutExchange fanout("fanout"); - BOOST_CHECK(fanout.bind(a, "", 0)); - BOOST_CHECK(fanout.bind(b, "", 0)); - BOOST_CHECK(fanout.bind(c, "", 0)); + BOOST_CHECK(fanout.bind(a, "", 0, 0)); + BOOST_CHECK(fanout.bind(b, "", 0, 0)); + BOOST_CHECK(fanout.bind(c, "", 0, 0)); BOOST_CHECK(fanout.isBound(a, 0, 0)); BOOST_CHECK(fanout.isBound(b, 0, 0)); @@ -88,10 +88,10 @@ QPID_AUTO_TEST_CASE(testIsBound) BOOST_CHECK(!fanout.isBound(d, 0, 0)); DirectExchange direct("direct"); - BOOST_CHECK(direct.bind(a, k1, 0)); - BOOST_CHECK(direct.bind(a, k3, 0)); - BOOST_CHECK(direct.bind(b, k2, 0)); - BOOST_CHECK(direct.bind(c, k1, 0)); + BOOST_CHECK(direct.bind(a, k1, 0, 0)); + BOOST_CHECK(direct.bind(a, k3, 0, 0)); + BOOST_CHECK(direct.bind(b, k2, 0, 0)); + BOOST_CHECK(direct.bind(c, k1, 0, 0)); BOOST_CHECK(direct.isBound(a, 0, 0)); BOOST_CHECK(direct.isBound(a, &k1, 0)); @@ -106,10 +106,10 @@ QPID_AUTO_TEST_CASE(testIsBound) BOOST_CHECK(!direct.isBound(d, &k3, 0)); TopicExchange topic("topic"); - BOOST_CHECK(topic.bind(a, k1, 0)); - BOOST_CHECK(topic.bind(a, k3, 0)); - BOOST_CHECK(topic.bind(b, k2, 0)); - BOOST_CHECK(topic.bind(c, k1, 0)); + BOOST_CHECK(topic.bind(a, k1, 0, 0)); + BOOST_CHECK(topic.bind(a, k3, 0, 0)); + BOOST_CHECK(topic.bind(b, k2, 0, 0)); + BOOST_CHECK(topic.bind(c, k1, 0, 0)); BOOST_CHECK(topic.isBound(a, 0, 0)); BOOST_CHECK(topic.isBound(a, &k1, 0)); @@ -137,10 +137,10 @@ QPID_AUTO_TEST_CASE(testIsBound) args3.setString("c", "C"); args3.setInt("b", 6); - headers.bind(a, "", &args1); - headers.bind(a, "", &args3); - headers.bind(b, "", &args2); - headers.bind(c, "", &args1); + headers.bind(a, "", &args1, 0); + headers.bind(a, "", &args3, 0); + headers.bind(b, "", &args2, 0); + headers.bind(c, "", &args1, 0); BOOST_CHECK(headers.isBound(a, 0, 0)); BOOST_CHECK(headers.isBound(a, 0, &args1)); @@ -250,10 +250,10 @@ QPID_AUTO_TEST_CASE(testIVEOption) Queue::shared_ptr queue2(new Queue("queue2", true)); Queue::shared_ptr queue3(new Queue("queue3", true)); - BOOST_CHECK(direct.bind(queue, "abc", 0)); - BOOST_CHECK(fanout.bind(queue1, "abc", 0)); - BOOST_CHECK(header.bind(queue2, "", &args2)); - BOOST_CHECK(topic.bind(queue3, "abc", 0)); + BOOST_CHECK(direct.bind(queue, "abc", 0, 0)); + BOOST_CHECK(fanout.bind(queue1, "abc", 0, 0)); + BOOST_CHECK(header.bind(queue2, "", &args2, 0)); + BOOST_CHECK(topic.bind(queue3, "abc", 0, 0)); BOOST_CHECK_EQUAL(1u,queue->getMessageCount()); BOOST_CHECK_EQUAL(1u,queue1->getMessageCount()); Modified: qpid/branches/asyncstore/cpp/src/tests/HeadersExchangeTest.cpp URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/HeadersExchangeTest.cpp?rev=1399662&r1=1399661&r2=1399662&view=diff ============================================================================== --- qpid/branches/asyncstore/cpp/src/tests/HeadersExchangeTest.cpp (original) +++ qpid/branches/asyncstore/cpp/src/tests/HeadersExchangeTest.cpp Thu Oct 18 13:37:42 2012 @@ -109,7 +109,7 @@ QPID_AUTO_TEST_CASE(testBindNoXMatch) FieldTable args; try { //just checking this doesn't cause assertion etc - exchange.bind(queue, key, &args); + exchange.bind(queue, key, &args, 0); } catch(qpid::Exception&) { //expected } Modified: qpid/branches/asyncstore/cpp/src/tests/QueueTest.cpp URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/QueueTest.cpp?rev=1399662&r1=1399661&r2=1399662&view=diff ============================================================================== --- qpid/branches/asyncstore/cpp/src/tests/QueueTest.cpp (original) +++ qpid/branches/asyncstore/cpp/src/tests/QueueTest.cpp Thu Oct 18 13:37:42 2012 @@ -100,15 +100,15 @@ QPID_AUTO_TEST_CASE(testBound){ ExchangeRegistry exchanges; //establish bindings from exchange->queue and notify the queue as it is bound: Exchange::shared_ptr exchange1 = exchanges.declare("my-exchange-1", "direct").first; - exchange1->bind(queue, key, &args); + exchange1->bind(queue, key, &args, 0); queue->bound(exchange1->getName(), key, args); Exchange::shared_ptr exchange2 = exchanges.declare("my-exchange-2", "fanout").first; - exchange2->bind(queue, key, &args); + exchange2->bind(queue, key, &args, 0); queue->bound(exchange2->getName(), key, args); Exchange::shared_ptr exchange3 = exchanges.declare("my-exchange-3", "topic").first; - exchange3->bind(queue, key, &args); + exchange3->bind(queue, key, &args, 0); queue->bound(exchange3->getName(), key, args); //delete one of the exchanges: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
