QPID-8430: Excessive memory use when rerouting messages

Kim van der Riet · Kim van der Riet · commit 8b1a3dc1c9f0 · 2020-03-20T10:18:57.000-04:00
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,9 @@ void Message::addTraceId(const std::string& id)`
`127`	`127`
`128`	`128`	`void Message::clearTrace()`
`129`	`129`	`{`
`130`		`- addAnnotation(X_QPID_TRACE, std::string());`
	`130`	`+ if (!getPropertyAsString(X_QPID_TRACE).empty()) {`
	`131`	`+ addAnnotation(X_QPID_TRACE, std::string());`
	`132`	`+ }`
`131`	`133`	`}`
`132`	`134`
`133`	`135`	`uint64_t Message::getTimestamp() const`