summaryrefslogtreecommitdiff
path: root/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
commite3af2ca02840a6697461532d0059105c5fd08e84 (patch)
tree19ad73985f025dfaf0113c3d22812b14f6aca047 /cpp/src
parente36a24bb215c62ff79f2361fd5d544a7f3ef050e (diff)
downloadqpid-python-e3af2ca02840a6697461532d0059105c5fd08e84.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/qpid@1041180 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/management/ManagementAgent.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp
index d06b570de9..11e65efd64 100644
--- a/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/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);
{