Author: astitcher
Date: Thu Dec 20 23:42:57 2012
New Revision: 1424761
URL: http://svn.apache.org/viewvc?rev=1424761&view=rev
Log:
NO-JIRA: Removed some unused Broker code
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1424761&r1=1424760&r2=1424761&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Thu Dec 20 23:42:57 2012
@@ -1010,24 +1010,13 @@ void Broker::accept() {
void Broker::connect(
const std::string& host, const std::string& port, const std::string&
transport,
- boost::function2<void, int, std::string> failed,
- sys::ConnectionCodec::Factory* f)
+ boost::function2<void, int, std::string> failed)
{
boost::shared_ptr<ProtocolFactory> pf = getProtocolFactory(transport);
- if (pf) pf->connect(poller, host, port, f ? f : factory.get(), failed);
+ if (pf) pf->connect(poller, host, port, factory.get(), failed);
else throw NoSuchTransportException(QPID_MSG("Unsupported transport type:
" << transport));
}
-void Broker::connect(
- const Url& url,
- boost::function2<void, int, std::string> failed,
- sys::ConnectionCodec::Factory* f)
-{
- url.throwIfEmpty();
- const Address& addr=url[0];
- connect(addr.host, boost::lexical_cast<std::string>(addr.port),
addr.protocol, failed, f);
-}
-
uint32_t Broker::queueMoveMessages(
const std::string& srcQueue,
const std::string& destQueue,
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h?rev=1424761&r1=1424760&r2=1424761&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h Thu Dec 20 23:42:57 2012
@@ -247,12 +247,7 @@ class Broker : public sys::Runnable, pub
/** Create a connection to another broker. */
void connect(const std::string& host, const std::string& port,
const std::string& transport,
- boost::function2<void, int, std::string> failed,
- sys::ConnectionCodec::Factory* =0);
- /** Create a connection to another broker. */
- void connect(const Url& url,
- boost::function2<void, int, std::string> failed,
- sys::ConnectionCodec::Factory* =0);
+ boost::function2<void, int, std::string> failed);
/** Move messages from one queue to another.
A zero quantity means to move all messages
@@ -269,9 +264,6 @@ class Broker : public sys::Runnable, pub
/** Expose poller so plugins can register their descriptors. */
QPID_BROKER_EXTERN boost::shared_ptr<sys::Poller> getPoller();
- boost::shared_ptr<sys::ConnectionCodec::Factory> getConnectionFactory() {
return factory; }
- void setConnectionFactory(boost::shared_ptr<sys::ConnectionCodec::Factory>
f) { factory = f; }
-
/** Timer for local tasks affecting only this broker */
sys::Timer& getTimer() { return timer; }
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
