1 files changed, 7 insertions, 11 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp b/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
index f36a1e8da4..53e49d2bca 100644
--- a/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
@@ -21,8 +21,6 @@
 #include "ManagedOutgoingLink.h"
 #include "qpid/broker/amqp/ManagedSession.h"
 #include "qpid/broker/Broker.h"
-#include "qpid/broker/Queue.h"
-#include "qpid/types/Variant.h"
 #include "qpid/management/ManagementAgent.h"
 #include "qpid/log/Statement.h"
 
@@ -32,30 +30,28 @@ namespace qpid {
 namespace broker {
 namespace amqp {
 
-ManagedOutgoingLink::ManagedOutgoingLink(Broker& broker, Queue& q, ManagedSession& p, const std::string i, bool topic)
-    : parent(p), id(i)
+ManagedOutgoingLink::ManagedOutgoingLink(Broker& broker, ManagedSession& p, const std::string& source, const std::string& _name)
+    : parent(p), name(_name)
 {
     qpid::management::ManagementAgent* agent = broker.getManagementAgent();
     if (agent) {
-        subscription = _qmf::Subscription::shared_ptr(new _qmf::Subscription(agent, this, &p, q.GetManagementObject()->getObjectId(), id,
-                                                           false/*FIXME*/, true/*FIXME*/, topic, qpid::types::Variant::Map()));
-        agent->addObject(subscription);
-        subscription->set_creditMode("n/a");
+        outgoing = _qmf::Outgoing::shared_ptr(new _qmf::Outgoing(agent, this, &parent, source, _name));
+        agent->addObject(outgoing);
     }
 }
 ManagedOutgoingLink::~ManagedOutgoingLink()
 {
-    if (subscription != 0) subscription->resourceDestroy();
+    if (outgoing != 0) outgoing->resourceDestroy();
 }
 
 qpid::management::ManagementObject::shared_ptr ManagedOutgoingLink::GetManagementObject() const
 {
-    return subscription;
+    return outgoing;
 }
 
 void ManagedOutgoingLink::outgoingMessageSent()
 {
-    if (subscription) { subscription->inc_delivered(); }
+    if (outgoing) { outgoing->inc_transfers(); }
     parent.outgoingMessageSent();
 }
 void ManagedOutgoingLink::outgoingMessageAccepted()