From bddb141595d41b11cbd0f56b8da9e4da0d217faa Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 18 Jan 2011 20:43:41 +0000 Subject: QPID-2982 Bug 669452 - Creating a route and using management tools can crash cluster members. Cluster update did not include federation link and bridge objects. Fixed update to include them. Management linkUp and linkDown events were generated only on the broker receiving the link. Suppressed these events in a cluster. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1060568 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/Bridge.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'cpp/src/qpid/broker/Bridge.cpp') diff --git a/cpp/src/qpid/broker/Bridge.cpp b/cpp/src/qpid/broker/Bridge.cpp index 5911d916ad..7fbbf4e2c4 100644 --- a/cpp/src/qpid/broker/Bridge.cpp +++ b/cpp/src/qpid/broker/Bridge.cpp @@ -60,8 +60,7 @@ Bridge::Bridge(Link* _link, framing::ChannelId _id, CancellationListener l, (agent, this, link, id, args.i_durable, args.i_src, args.i_dest, args.i_key, args.i_srcIsQueue, args.i_srcIsLocal, args.i_tag, args.i_excludes, args.i_dynamic, args.i_sync); - if (!args.i_durable) - agent->addObject(mgmtObject); + agent->addObject(mgmtObject); } QPID_LOG(debug, "Bridge created from " << args.i_src << " to " << args.i_dest); } @@ -167,10 +166,6 @@ void Bridge::destroy() void Bridge::setPersistenceId(uint64_t pId) const { - if (mgmtObject != 0 && persistenceId == 0) { - ManagementAgent* agent = link->getBroker()->getManagementAgent(); - agent->addObject (mgmtObject, pId); - } persistenceId = pId; } -- cgit v1.2.1