1 files changed, 8 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp
index e012d693fb..b56b152397 100644
--- a/cpp/src/qpid/broker/SemanticState.cpp
+++ b/cpp/src/qpid/broker/SemanticState.cpp
@@ -32,6 +32,8 @@
 #include "TxAck.h"
 #include "TxPublish.h"
 #include "qpid/framing/reply_exceptions.h"
+#include "qpid/framing/MessageTransferBody.h"
+#include "qpid/framing/Message010TransferBody.h"
 #include "qpid/log/Statement.h"
 #include "qpid/ptr_map.h"
 
@@ -344,8 +346,12 @@ void SemanticState::handle(intrusive_ptr<Message> msg) {
 }
 
 void SemanticState::route(intrusive_ptr<Message> msg, Deliverable& strategy) {
-    std::string exchangeName = msg->getExchangeName();      
-    msg->getProperties<DeliveryProperties>()->setExchange(exchangeName);
+    std::string exchangeName = msg->getExchangeName();
+    if (msg->isA<MessageTransferBody>()) {
+        msg->getProperties<DeliveryProperties>()->setExchange(exchangeName);
+    } else if (msg->isA<Message010TransferBody>()) {
+        msg->getProperties<DeliveryProperties010>()->setExchange(exchangeName);
+    }
     if (!cacheExchange || cacheExchange->getName() != exchangeName){
         cacheExchange = session.getBroker().getExchanges().get(exchangeName);
     }