1 files changed, 10 insertions, 5 deletions
diff --git a/cpp/src/qmf/engine/ResilientConnection.cpp b/cpp/src/qmf/engine/ResilientConnection.cpp
index 709cfd1236..9502130288 100644
--- a/cpp/src/qmf/engine/ResilientConnection.cpp
+++ b/cpp/src/qmf/engine/ResilientConnection.cpp
@@ -171,15 +171,20 @@ void RCSession::received(client::Message& msg)
     MessageImpl qmsg;
     qmsg.body = msg.getData();
 
-    qpid::framing::MessageProperties p = msg.getMessageProperties();
-    if (p.hasReplyTo()) {
-        const qpid::framing::ReplyTo& rt = p.getReplyTo();
+    qpid::framing::DeliveryProperties dp = msg.getDeliveryProperties();
+    if (dp.hasRoutingKey()) {
+        qmsg.routingKey = dp.getRoutingKey();
+    }
+
+    qpid::framing::MessageProperties mp = msg.getMessageProperties();
+    if (mp.hasReplyTo()) {
+        const qpid::framing::ReplyTo& rt = mp.getReplyTo();
         qmsg.replyExchange = rt.getExchange();
         qmsg.replyKey = rt.getRoutingKey();
     }
 
-    if (p.hasUserId()) {
-        qmsg.userId = p.getUserId();
+    if (mp.hasUserId()) {
+        qmsg.userId = mp.getUserId();
     }
 
     connImpl.EnqueueEvent(ResilientConnectionEvent::RECV, userContext, qmsg);