summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/broker/SessionState.cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2014-05-23 16:10:27 +0000
committerGordon Sim <gsim@apache.org>2014-05-23 16:10:27 +0000
commit0c839dc7a1ca94f91dfda29134c3feffe3d6d3d5 (patch)
treefbe6e22c3d6d29dac44645ece91b682d4e84c8a8 /cpp/src/qpid/broker/SessionState.cpp
parent8f8d83c8a6a078ec1595e2c58eed7ab00ce080c4 (diff)
downloadqpid-python-0c839dc7a1ca94f91dfda29134c3feffe3d6d3d5.tar.gz
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/qpid@1597121 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/SessionState.cpp')
-rw-r--r--cpp/src/qpid/broker/SessionState.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp
index 0c343e5d90..2b849e945f 100644
--- a/cpp/src/qpid/broker/SessionState.cpp
+++ b/cpp/src/qpid/broker/SessionState.cpp
@@ -219,7 +219,8 @@ void SessionState::handleContent(AMQFrame& frame)
DeliverableMessage deliverable(Message(msg, msg), semanticState.getTxBuffer());
if (broker.isTimestamping())
msg->setTimestamp();
- deliverable.getMessage().setPublisher(getConnection());
+ msg->setPublisher(&(getConnection()));
+ msg->computeExpiration(getBroker().getExpiryPolicy());
IncompleteIngressMsgXfer xfer(this, msg);