From 0bb3b154e3357ba14bfd3b1c04617c0ad16000c2 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Mon, 2 Aug 2010 16:44:55 +0000 Subject: Fixed bug in setting of the app-id header (it was set in the application-headers rather than the message-properties). Made the broker agent more selective about when it broadcasts console-added messages. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@981592 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/management/ManagementAgent.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'cpp/src/qpid/management') diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp index 5602dda2c6..847f2b53ce 100644 --- a/cpp/src/qpid/management/ManagementAgent.cpp +++ b/cpp/src/qpid/management/ManagementAgent.cpp @@ -428,10 +428,26 @@ void ManagementAgent::clientAdded (const string& routingKey) { sys::Mutex::ScopedLock lock(userLock); - if (routingKey.find("console") != 0) + // + // If this routing key is not relevant to object updates, exit. + // + if ((routingKey.compare(0, 1, "#") != 0) && + (routingKey.compare(0, 9, "console.#") != 0) && + (routingKey.compare(0, 12, "console.obj.") != 0)) return; + // + // Mark local objects for full-update. + // clientWasAdded = true; + + // + // If the routing key is relevant for local objects only, don't involve + // any of the remote agents. + // + if (routingKey.compare(0, 39, "console.obj.*.*.org.apache.qpid.broker.") == 0) + return; + std::list rkeys; for (RemoteAgentMap::iterator aIter = remoteAgents.begin(); @@ -570,11 +586,11 @@ void ManagementAgent::sendBufferLH(const string& data, props->setCorrelationId(cid); } props->setContentType(content_type); + props->setAppId("qmf2"); for (i = headers.begin(); i != headers.end(); ++i) { msg->getOrInsertHeaders().setString(i->first, i->second.asString()); } - msg->getOrInsertHeaders().setString("app_id", "qmf2"); DeliveryProperties* dp = msg->getFrames().getHeaders()->get(true); -- cgit v1.2.1