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);