summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/framing
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/qpid/framing')
-rw-r--r--cpp/src/qpid/framing/AMQContentBody.cpp4
-rw-r--r--cpp/src/qpid/framing/TransferContent.cpp4
2 files changed, 3 insertions, 5 deletions
diff --git a/cpp/src/qpid/framing/AMQContentBody.cpp b/cpp/src/qpid/framing/AMQContentBody.cpp
index 13491589c4..59f3619ef2 100644
--- a/cpp/src/qpid/framing/AMQContentBody.cpp
+++ b/cpp/src/qpid/framing/AMQContentBody.cpp
@@ -40,7 +40,5 @@ void qpid::framing::AMQContentBody::decode(Buffer& buffer, uint32_t _size){
void qpid::framing::AMQContentBody::print(std::ostream& out) const
{
out << "content (" << size() << " bytes)";
-#ifndef NDEBUG
- out << " " << data.substr(0,10) << "...";
-#endif
+ out << " " << data.substr(0,16) << "...";
}
diff --git a/cpp/src/qpid/framing/TransferContent.cpp b/cpp/src/qpid/framing/TransferContent.cpp
index 1bb69fbca9..99f5d365e8 100644
--- a/cpp/src/qpid/framing/TransferContent.cpp
+++ b/cpp/src/qpid/framing/TransferContent.cpp
@@ -29,8 +29,8 @@ TransferContent::TransferContent(const std::string& data,
const std::string& exchange)
{
setData(data);
- getDeliveryProperties().setRoutingKey(routingKey);
- getDeliveryProperties().setExchange(exchange);
+ if (routingKey.size()) getDeliveryProperties().setRoutingKey(routingKey);
+ if (exchange.size()) getDeliveryProperties().setExchange(exchange);
}
AMQHeaderBody TransferContent::getHeader() const