Merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@824198 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 4 deletions

diff --git a/qpid/cpp/examples/messaging/server.cpp b/qpid/cpp/examples/messaging/server.cpp
index 38f4601ff6..024832f914 100644
--- a/qpid/cpp/examples/messaging/server.cpp
+++ b/qpid/cpp/examples/messaging/server.cpp
@@ -51,17 +51,17 @@ int main(int argc, char** argv) {
             const Address& address = request.getReplyTo();
             if (address) {
                 Sender sender = session.createSender(address);
-                std::string s = request.getContent().asString();
+                std::string s = request.getContent();
                 std::transform(s.begin(), s.end(), s.begin(), toupper);
                 Message response(s);
                 sender.send(response);
                 std::cout << "Processed request: " 
-                          << request.getContent().asString() 
+                          << request.getContent() 
                           << " -> " 
-                          << response.getContent().asString() << std::endl;
+                          << response.getContent() << std::endl;
                 session.acknowledge();
             } else {
-                std::cerr << "Error: no reply address specified for request: " << request.getContent().asString() << std::endl;
+                std::cerr << "Error: no reply address specified for request: " << request.getContent() << std::endl;
                 session.reject(request);
             }
         }