summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2010-12-01 21:32:52 +0000
committerAlan Conway <aconway@apache.org>2010-12-01 21:32:52 +0000
commit4101090c274118708f0183b436f3de68f1a32277 (patch)
tree01d7ad1e568ac20fcf150593214a6da462cf1c28 /qpid/cpp/src
parent554a5e74935d61a9be4a030aa54c501d7caf7416 (diff)
downloadqpid-python-4101090c274118708f0183b436f3de68f1a32277.tar.gz
Add missing call to Message::setTimestamp in ManagementAgent::sendBufferLH.
Without this, messages generated here will not be expired consistently in a cluster which may cause a broker to become inconsistent and exit with an invalid-argument error. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1041180 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/management/ManagementAgent.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/management/ManagementAgent.cpp b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
index d06b570de9..11e65efd64 100644
--- a/qpid/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
@@ -596,9 +596,10 @@ void ManagementAgent::sendBufferLH(const string& data,
DeliveryProperties* dp =
msg->getFrames().getHeaders()->get<DeliveryProperties>(true);
dp->setRoutingKey(routingKey);
- if (ttl_msec)
+ if (ttl_msec) {
dp->setTtl(ttl_msec);
-
+ msg->setTimestamp(broker->getExpiryPolicy());
+ }
msg->getFrames().append(content);
{