Author: aconway
Date: Wed Jan 30 14:32:17 2008
New Revision: 616927
URL: http://svn.apache.org/viewvc?rev=616927&view=rev
Log:
Remove Socket param from Connection constructor, pass a string id instead.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionFactory.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp?rev=616927&r1=616926&r2=616927&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp Wed Jan 30
14:32:17 2008
@@ -47,7 +47,7 @@
namespace qpid {
namespace broker {
- Connection::Connection(ConnectionOutputHandler* out_, Broker& broker_,
const Socket& s) :
+Connection::Connection(ConnectionOutputHandler* out_, Broker& broker_, const
std::string& mgmtId) :
broker(broker_),
outputTasks(*out_),
out(out_),
@@ -67,7 +67,7 @@
if (agent.get () != 0)
{
mgmtObject = management::Client::shared_ptr
- (new management::Client (this, parent, s.getPeerAddress ()));
+ (new management::Client (this, parent, mgmtId));
agent->addObject (mgmtObject);
}
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h?rev=616927&r1=616926&r2=616927&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h Wed Jan 30
14:32:17 2008
@@ -52,7 +52,7 @@
public management::Manageable
{
public:
- Connection(sys::ConnectionOutputHandler* out, Broker& broker, const
sys::Socket& s);
+ Connection(sys::ConnectionOutputHandler* out, Broker& broker, const
std::string& mgmtId);
~Connection ();
/** Get the SessionHandler for channel. Create if it does not already
exist */
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionFactory.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionFactory.cpp?rev=616927&r1=616926&r2=616927&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionFactory.cpp
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionFactory.cpp Wed Jan
30 14:32:17 2008
@@ -38,7 +38,7 @@
ConnectionFactory::create(qpid::sys::ConnectionOutputHandler* out,
const qpid::sys::Socket& s)
{
- return new Connection(out, broker, s);
+ return new Connection(out, broker, s.getPeerAddress());
}
}} // namespace qpid::broker
