summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
diff options
context:
space:
mode:
authorKenneth Anthony Giusti <kgiusti@apache.org>2012-03-22 13:39:14 +0000
committerKenneth Anthony Giusti <kgiusti@apache.org>2012-03-22 13:39:14 +0000
commit3c2954782cc6d27bacf8865cfaea9c71c2bfec2b (patch)
tree2f319b97e0c6d9e0052a8606f0e29d2b643834c2 /qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
parentb51489127365952db902579438294a587a7acf47 (diff)
downloadqpid-python-qpid-3890.tar.gz
QPID-3890: resync this branch to latest trunkqpid-3890
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3890@1303774 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/cluster/ClusterTimer.cpp')
-rw-r--r--qpid/cpp/src/qpid/cluster/ClusterTimer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp b/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
index b4f7d00f38..90e4fa9d4d 100644
--- a/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
+++ b/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
@@ -24,6 +24,7 @@
#include "qpid/log/Statement.h"
#include "qpid/framing/ClusterTimerWakeupBody.h"
#include "qpid/framing/ClusterTimerDropBody.h"
+#include "qpid/sys/ClusterSafe.h"
namespace qpid {
namespace cluster {
@@ -107,6 +108,7 @@ void ClusterTimer::drop(intrusive_ptr<TimerTask> t) {
// Deliver thread
void ClusterTimer::deliverWakeup(const std::string& name) {
QPID_LOG(trace, "Cluster timer wakeup delivered for " << name);
+ qpid::sys::assertClusterSafe();
Map::iterator i = map.find(name);
if (i == map.end())
throw Exception(QPID_MSG("Cluster timer wakeup non-existent task " << name));