summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2013-08-05 20:12:27 +0000
committerGordon Sim <gsim@apache.org>2013-08-05 20:12:27 +0000
commit617de738ac4cdb05a6d426fc24ad4b1b985e4558 (patch)
treee6b310ded75284d3c934d4c391a92854c3f87d73 /qpid/cpp
parent8b4ce07e63b3ed12b43ae82fc487657c6e18f5e4 (diff)
downloadqpid-python-617de738ac4cdb05a6d426fc24ad4b1b985e4558.tar.gz
QPID-5041: ensure persistence id is not lost when annotation is added
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1510696 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/qpid/broker/Message.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/broker/Message.cpp b/qpid/cpp/src/qpid/broker/Message.cpp
index ec44404793..197d097183 100644
--- a/qpid/cpp/src/qpid/broker/Message.cpp
+++ b/qpid/cpp/src/qpid/broker/Message.cpp
@@ -182,8 +182,10 @@ void Message::addAnnotation(const std::string& key, const qpid::types::Variant&
void Message::annotationsChanged()
{
if (persistentContext) {
+ uint64_t id = persistentContext->getPersistenceId();
persistentContext = persistentContext->merge(annotations);
persistentContext->setIngressCompletion(encoding);
+ persistentContext->setPersistenceId(id);
}
}