Merged out from trunkQPID-2519

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187375 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 24 insertions, 3 deletions

diff --git a/cpp/src/qpid/cluster/UpdateExchange.cpp b/cpp/src/qpid/cluster/UpdateExchange.cpp
index 11937f296f..cb1376004e 100644
--- a/cpp/src/qpid/cluster/UpdateExchange.cpp
+++ b/cpp/src/qpid/cluster/UpdateExchange.cpp
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,6 +19,7 @@
  *
  */
 #include "qpid/framing/MessageTransferBody.h"
+#include "qpid/framing/FieldTable.h"
 #include "qpid/broker/Message.h"
 #include "UpdateExchange.h"
 
@@ -27,6 +28,8 @@ namespace cluster {
 
 using framing::MessageTransferBody;
 using framing::DeliveryProperties;
+using framing::MessageProperties;
+using framing::FieldTable;
 
 UpdateExchange::UpdateExchange(management::Manageable* parent)
     : broker::Exchange(UpdateClient::UPDATE, parent),
@@ -34,6 +37,7 @@ UpdateExchange::UpdateExchange(management::Manageable* parent)
 
 
 void UpdateExchange::setProperties(const boost::intrusive_ptr<broker::Message>& msg) {
+    // Copy exchange name to destination property.
     MessageTransferBody* transfer = msg->getMethod<MessageTransferBody>();
     assert(transfer);
     const DeliveryProperties* props = msg->getProperties<DeliveryProperties>();
@@ -42,6 +46,23 @@ void UpdateExchange::setProperties(const boost::intrusive_ptr<broker::Message>&
         transfer->setDestination(props->getExchange());
     else
         transfer->clearDestinationFlag();
-}
 
+    // Copy expiration from x-property if present.
+    if (msg->hasProperties<MessageProperties>()) {
+        const MessageProperties* mprops = msg->getProperties<MessageProperties>();
+        if (mprops->hasApplicationHeaders()) {
+            const FieldTable& headers = mprops->getApplicationHeaders();
+            if (headers.isSet(UpdateClient::X_QPID_EXPIRATION)) {
+                msg->setExpiration(
+                    sys::AbsTime(sys::EPOCH, headers.getAsInt64(UpdateClient::X_QPID_EXPIRATION)));
+                msg->removeCustomProperty(UpdateClient::X_QPID_EXPIRATION);
+                // Erase props/headers that were added by the UpdateClient
+                if (headers.isSet(UpdateClient::X_QPID_NO_MESSAGE_PROPS))
+                    msg->eraseProperties<MessageProperties>();
+                else if (headers.isSet(UpdateClient::X_QPID_NO_HEADERS))
+                    msg->clearApplicationHeadersFlag();
+            }
+        }
+    }
+}
 }} // namespace qpid::cluster