[qpid-cpp] branch master updated: QPID-8430: Excessive memory use when rerouting messages

[kp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kpvdr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new 8b1a3dc  QPID-8430: Excessive memory use when rerouting messages
8b1a3dc is described below

commit 8b1a3dc1c9f0708685a9a515536f2ae2e4d37807
Author: Kim van der Riet <kp...@apache.org>
AuthorDate: Fri Mar 20 10:18:57 2020 -0400

    QPID-8430: Excessive memory use when rerouting messages
---
 src/qpid/broker/Message.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/qpid/broker/Message.cpp b/src/qpid/broker/Message.cpp
index 8f39fbd..d8450f6 100644
--- a/src/qpid/broker/Message.cpp
+++ b/src/qpid/broker/Message.cpp
@@ -127,7 +127,9 @@ void Message::addTraceId(const std::string& id)
 
 void Message::clearTrace()
 {
-    addAnnotation(X_QPID_TRACE, std::string());
+    if (!getPropertyAsString(X_QPID_TRACE).empty()) {
+        addAnnotation(X_QPID_TRACE, std::string());
+    }
 }
 
 uint64_t Message::getTimestamp() const


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org