summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/qpid/messaging/Message.cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2016-03-30 10:33:29 +0000
committerGordon Sim <gsim@apache.org>2016-03-30 10:33:29 +0000
commit87aa4db83f1a7c2ffbdf168a7c5b942cb5d56a4a (patch)
tree0ab32d9e81c98eee9c19f44047a3e537e61d6a6d /qpid/cpp/src/qpid/messaging/Message.cpp
parent006496cf708639db842f37941c40f7d452789509 (diff)
downloadqpid-python-87aa4db83f1a7c2ffbdf168a7c5b942cb5d56a4a.tar.gz
QPID-7134: ensure content object is reset when bytes are set
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1737093 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/messaging/Message.cpp')
-rw-r--r--qpid/cpp/src/qpid/messaging/Message.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/messaging/Message.cpp b/qpid/cpp/src/qpid/messaging/Message.cpp
index 299ed1b9f3..376e1cc5f6 100644
--- a/qpid/cpp/src/qpid/messaging/Message.cpp
+++ b/qpid/cpp/src/qpid/messaging/Message.cpp
@@ -78,13 +78,13 @@ void Message::setProperty(const std::string& k, const qpid::types::Variant& v) {
void Message::setContent(const std::string& c) { this->setContentBytes(c); }
void Message::setContent(const char* chars, size_t count) {
- if (count == 0) impl->getContent().reset();
+ impl->getContent().reset();
impl->setBytes(chars, count);
}
std::string Message::getContent() const { return impl->getBytes(); }
void Message::setContentBytes(const std::string& c) {
- if (c.empty()) impl->getContent().reset();
+ impl->getContent().reset();
impl->setBytes(c);
}
std::string Message::getContentBytes() const {return impl->getBytes(); }