Author: gsim
Date: Fri Nov 14 10:50:54 2008
New Revision: 714099
URL: http://svn.apache.org/viewvc?rev=714099&view=rev
Log:
Avoid alarming error message when unencrypted tcp is disabled. Test
availability of tcp transport rather than catching exception if its not enabled.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=714099&r1=714098&r2=714099&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Fri Nov 14
10:50:54 2008
@@ -240,11 +240,10 @@
queueCleaner.start(conf.queueCleanInterval * qpid::sys::TIME_SEC);
}
- //initialize known broker urls:
- try {
- knownBrokers.push_back ( qpid::Url::getIpAddressesUrl (
getPort(TCP_TRANSPORT) ) );
- } catch (const NoSuchTransportException& e) {
- QPID_LOG(error, "Could not send client known broker urls for cluster:
" << e.what());
+ //initialize known broker urls (TODO: add support for urls for other
transports (SSL, RDMA)):
+ boost::shared_ptr<ProtocolFactory> factory =
getProtocolFactory(TCP_TRANSPORT);
+ if (factory) {
+ knownBrokers.push_back ( qpid::Url::getIpAddressesUrl (
factory->getPort() ) );
}
}
