From 66efa54f6d9621ad4dcd9a0a86842c4a835af971 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Mon, 5 Aug 2013 20:12:27 +0000 Subject: 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 --- cpp/src/qpid/broker/Message.cpp | 2 ++ 1 file changed, 2 insertions(+) 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); } } -- cgit v1.2.1