From 30809559cc5b352515b75a961d0f10fdead81e2c Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 23 May 2014 16:10:27 +0000 Subject: QPID-5783: Share immutable state between copies of a message. Avoid using memory for annotations unless actually required. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1597121 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/MessageUtils.h | 1 + qpid/cpp/src/tests/QueueTest.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/src/tests') diff --git a/qpid/cpp/src/tests/MessageUtils.h b/qpid/cpp/src/tests/MessageUtils.h index a6a5aa65fd..2c205da20f 100644 --- a/qpid/cpp/src/tests/MessageUtils.h +++ b/qpid/cpp/src/tests/MessageUtils.h @@ -107,6 +107,7 @@ struct MessageUtils AMQFrame data((AMQContentBody(content))); msg->getFrames().append(data); } + if (ttl) msg->computeExpiration(new broker::ExpiryPolicy); return Message(msg, msg); } }; diff --git a/qpid/cpp/src/tests/QueueTest.cpp b/qpid/cpp/src/tests/QueueTest.cpp index c44483f8dd..99c6880b26 100644 --- a/qpid/cpp/src/tests/QueueTest.cpp +++ b/qpid/cpp/src/tests/QueueTest.cpp @@ -188,7 +188,6 @@ void addMessagesToQueue(uint count, Queue& queue, uint oddTtl = 200, uint evenTt { for (uint i = 0; i < count; i++) { Message m = MessageUtils::createMessage("exchange", "key", i % 2 ? oddTtl : evenTtl); - m.computeExpiration(new broker::ExpiryPolicy); queue.deliver(m); } } -- cgit v1.2.1