1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/examples/messaging/client.cpp b/cpp/examples/messaging/client.cpp
index 9618123aa2..f0ecd96206 100644
--- a/cpp/examples/messaging/client.cpp
+++ b/cpp/examples/messaging/client.cpp
@@ -48,9 +48,8 @@ int main(int argc, char** argv) {
         Sender sender = session.createSender("service_queue");
 
         //create temp queue & receiver...
-        std::stringstream replies;
-        replies << "amq.direct/" << qpid::types::Uuid(true) << "; {node: {type:topic}}";
-        Receiver receiver = session.createReceiver(replies.str());
+        Address responseQueue("#response-queue; {create:always, delete:always}");
+        Receiver receiver = session.createReceiver(responseQueue);
 
 	// Now send some messages ...
 	string s[] = {
@@ -61,7 +60,7 @@ int main(int argc, char** argv) {
         };
 
     	Message request;
-        request.setReplyTo(replies.str());
+        request.setReplyTo(responseQueue);
 	for (int i=0; i<4; i++) {
             request.setContent(s[i]);
             sender.send(request);