From a5049238140656ad5fbf2ada920b65b507b327d6 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Fri, 31 Oct 2008 18:56:24 +0000 Subject: Federation enhancements and bug fixes: qmfconsole.py - minor fixes, make sure object-dereference only queries one broker Bridge.cpp - Added channel-id to queue name to avoid collisions qpid-route - Added link-map feature for viewing the entire federated topology git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@709532 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/broker/Bridge.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/qpid/broker/Bridge.cpp b/qpid/cpp/src/qpid/broker/Bridge.cpp index 8104907402..f9cb7ccd3c 100644 --- a/qpid/cpp/src/qpid/broker/Bridge.cpp +++ b/qpid/cpp/src/qpid/broker/Bridge.cpp @@ -27,6 +27,7 @@ #include "qpid/framing/FieldTable.h" #include "qpid/framing/Uuid.h" #include "qpid/log/Statement.h" +#include using qpid::framing::FieldTable; using qpid::framing::Uuid; @@ -59,7 +60,9 @@ Bridge::Bridge(Link* _link, framing::ChannelId _id, CancellationListener l, link(_link), id(_id), args(_args), mgmtObject(0), listener(l), name(Uuid(true).str()), queueName("bridge_queue_"), persistenceId(0) { - queueName += link->getBroker()->getFederationTag(); + std::stringstream title; + title << id << "_" << link->getBroker()->getFederationTag(); + queueName += title.str(); ManagementAgent* agent = ManagementAgent::Singleton::getInstance(); if (agent != 0) { mgmtObject = new _qmf::Bridge -- cgit v1.2.1