diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-09-13 21:36:27 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-09-13 21:36:27 +0000 |
| commit | b91d34e0c617e43350a475bc6a5fa081022bcf27 (patch) | |
| tree | 545aec751a0ab6c6d6f00f4b420e50647ac895f9 /cpp/src/qpid/broker/Connection.cpp | |
| parent | 3c118d635c00d96d74f62b8f4d4975479c4dc0b1 (diff) | |
| download | qpid-python-b91d34e0c617e43350a475bc6a5fa081022bcf27.tar.gz | |
NO-JIRA: Removed now unused cluster specific ClusterSafe code.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1384555 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Connection.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Connection.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp index 5818759cbe..08a9c756d0 100644 --- a/cpp/src/qpid/broker/Connection.cpp +++ b/cpp/src/qpid/broker/Connection.cpp @@ -26,7 +26,6 @@ #include "qpid/broker/Broker.h" #include "qpid/broker/Queue.h" #include "qpid/sys/SecuritySettings.h" -#include "qpid/sys/ClusterSafe.h" #include "qpid/log/Statement.h" #include "qpid/ptr_map.h" @@ -140,7 +139,7 @@ Connection::~Connection() if (mgmtObject != 0) { // In a cluster, Connections destroyed during shutdown are in // a cluster-unsafe context. Don't raise an event in that case. - if (!link && isClusterSafe()) + if (!link) agent->raiseEvent(_qmf::EventClientDisconnect(mgmtId, ConnectionState::getUserId(), mgmtObject->get_remoteProperties())); QPID_LOG_CAT(debug, model, "Delete connection. user:" << ConnectionState::getUserId() << " rhost:" << mgmtId ); @@ -188,7 +187,7 @@ bool isMessage(const AMQMethodBody* method) void Connection::recordFromServer(const framing::AMQFrame& frame) { // Don't record management stats in cluster-unsafe contexts - if (mgmtObject != 0 && isClusterSafe()) + if (mgmtObject != 0) { qmf::org::apache::qpid::broker::Connection::PerThreadStats *cStats = mgmtObject->getStatistics(); cStats->framesToClient += 1; @@ -203,7 +202,7 @@ void Connection::recordFromServer(const framing::AMQFrame& frame) void Connection::recordFromClient(const framing::AMQFrame& frame) { // Don't record management stats in cluster-unsafe contexts - if (mgmtObject != 0 && isClusterSafe()) + if (mgmtObject != 0) { qmf::org::apache::qpid::broker::Connection::PerThreadStats *cStats = mgmtObject->getStatistics(); cStats->framesFromClient += 1; @@ -358,7 +357,6 @@ void Connection::doIoCallbacks() { ScopedLock<Mutex> l(ioCallbackLock); // Although IO callbacks execute in the connection thread context, they are // not cluster safe because they are queued for execution in non-IO threads. - ClusterUnsafeScope cus; while (!ioCallbacks.empty()) { boost::function0<void> cb = ioCallbacks.front(); ioCallbacks.pop(); |