You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2012/03/22 20:36:35 UTC
svn commit: r1304003 - in /qpid/branches/0.16/qpid/cpp/src/qpid: broker/
broker/Queue.cpp cluster/ClusterTimer.cpp
Author: kgiusti
Date: Thu Mar 22 19:36:35 2012
New Revision: 1304003
URL: http://svn.apache.org/viewvc?rev=1304003&view=rev
Log:
QPID-3896: merge fix to 0.16 branch
Modified:
qpid/branches/0.16/qpid/cpp/src/qpid/broker/ (props changed)
qpid/branches/0.16/qpid/cpp/src/qpid/broker/Queue.cpp
qpid/branches/0.16/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
Propchange: qpid/branches/0.16/qpid/cpp/src/qpid/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/broker:r1303035
Modified: qpid/branches/0.16/qpid/cpp/src/qpid/broker/Queue.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.16/qpid/cpp/src/qpid/broker/Queue.cpp?rev=1304003&r1=1304002&r2=1304003&view=diff
==============================================================================
--- qpid/branches/0.16/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ qpid/branches/0.16/qpid/cpp/src/qpid/broker/Queue.cpp Thu Mar 22 19:36:35 2012
@@ -1361,7 +1361,7 @@ struct AutoDeleteTask : qpid::sys::Timer
Queue::shared_ptr queue;
AutoDeleteTask(Broker& b, Queue::shared_ptr q, AbsTime fireTime)
- : qpid::sys::TimerTask(fireTime, "DelayedAutoDeletion"), broker(b), queue(q) {}
+ : qpid::sys::TimerTask(fireTime, "DelayedAutoDeletion:"+q->getName()), broker(b), queue(q) {}
void fire()
{
Modified: qpid/branches/0.16/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.16/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp?rev=1304003&r1=1304002&r2=1304003&view=diff
==============================================================================
--- qpid/branches/0.16/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp (original)
+++ qpid/branches/0.16/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp Thu Mar 22 19:36:35 2012
@@ -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<Ti
// 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));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org