2 files changed, 16 insertions, 6 deletions
diff --git a/cpp/src/qpid/client/SessionImpl.cpp b/cpp/src/qpid/client/SessionImpl.cpp
index 8ead44a172..32541dceac 100644
--- a/cpp/src/qpid/client/SessionImpl.cpp
+++ b/cpp/src/qpid/client/SessionImpl.cpp
@@ -64,7 +64,8 @@ SessionImpl::SessionImpl(const std::string& name, boost::shared_ptr<ConnectionIm
       proxy(ioHandler),
       nextIn(0),
       nextOut(0),
-      sendMsgCredit(0)
+      sendMsgCredit(0),
+      doClearDeliveryPropertiesExchange(true)
 {
     channel.next = connectionShared.get();
 }
@@ -396,11 +397,16 @@ void SessionImpl::sendContent(const MethodContent& content)
 {
     AMQFrame header(content.getHeader());
 
-    // Client is not allowed to set the delivery-properties.exchange.
-    AMQHeaderBody* headerp = static_cast<AMQHeaderBody*>(header.getBody());
-    if (headerp && headerp->get<DeliveryProperties>())
-        headerp->get<DeliveryProperties>(true)->clearExchangeFlag();
-
+    // doClearDeliveryPropertiesExchange is set by cluster update client so
+    // it can send messages with delivery-properties.exchange set.
+    //
+    if (doClearDeliveryPropertiesExchange) {
+        // Normal client is not allowed to set the delivery-properties.exchange
+        // so clear it here.
+        AMQHeaderBody* headerp = static_cast<AMQHeaderBody*>(header.getBody());
+        if (headerp && headerp->get<DeliveryProperties>())
+            headerp->get<DeliveryProperties>(true)->clearExchangeFlag();
+    }
     header.setFirstSegment(false);
     uint64_t data_length = content.getData().length();
     if(data_length > 0){
diff --git a/cpp/src/qpid/client/SessionImpl.h b/cpp/src/qpid/client/SessionImpl.h
index 49d268c44d..0624bb8b3c 100644
--- a/cpp/src/qpid/client/SessionImpl.h
+++ b/cpp/src/qpid/client/SessionImpl.h
@@ -130,6 +130,8 @@ public:
      */
     boost::shared_ptr<ConnectionImpl> getConnection();
 
+    void setDoClearDeliveryPropertiesExchange(bool b=true) { doClearDeliveryPropertiesExchange = b; }
+
 private:
     enum State {
         INACTIVE,
@@ -243,6 +245,8 @@ private:
     // Only keep track of message credit 
     sys::Semaphore* sendMsgCredit;
 
+    bool doClearDeliveryPropertiesExchange;
+
   friend class client::SessionHandler;
 };