summaryrefslogtreecommitdiff
path: root/cpp/src/qpid
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
commit5892c18320f2cb4f3b32445bf80293cbc1923119 (patch)
tree83703a4176a4135a78df668fc1729dfe9e1a530c /cpp/src/qpid
parent66084bcbe57e598b857edcfab669849b9c7ebc9d (diff)
downloadqpid-python-5892c18320f2cb4f3b32445bf80293cbc1923119.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/qpid@1510696 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid')
-rw-r--r--cpp/src/qpid/broker/Message.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index ec44404793..197d097183 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/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);
}
}