diff options
Diffstat (limited to 'qpid')
| -rw-r--r-- | qpid/cpp/examples/messaging/client.cpp | 7 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/NullSaslServer.cpp | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/qpid/cpp/examples/messaging/client.cpp b/qpid/cpp/examples/messaging/client.cpp index f0ecd96206..9618123aa2 100644 --- a/qpid/cpp/examples/messaging/client.cpp +++ b/qpid/cpp/examples/messaging/client.cpp @@ -48,8 +48,9 @@ int main(int argc, char** argv) { Sender sender = session.createSender("service_queue"); //create temp queue & receiver... - Address responseQueue("#response-queue; {create:always, delete:always}"); - Receiver receiver = session.createReceiver(responseQueue); + std::stringstream replies; + replies << "amq.direct/" << qpid::types::Uuid(true) << "; {node: {type:topic}}"; + Receiver receiver = session.createReceiver(replies.str()); // Now send some messages ... string s[] = { @@ -60,7 +61,7 @@ int main(int argc, char** argv) { }; Message request; - request.setReplyTo(responseQueue); + request.setReplyTo(replies.str()); for (int i=0; i<4; i++) { request.setContent(s[i]); sender.send(request); diff --git a/qpid/cpp/src/qpid/NullSaslServer.cpp b/qpid/cpp/src/qpid/NullSaslServer.cpp index 8f415ba3ba..40bd9ebbc6 100644 --- a/qpid/cpp/src/qpid/NullSaslServer.cpp +++ b/qpid/cpp/src/qpid/NullSaslServer.cpp @@ -39,7 +39,10 @@ NullSaslServer::Status NullSaslServer::start(const std::string& mechanism, const } else if (i != std::string::npos) { //authorization id is first null delimited field uid = response->substr(0, i); - }//else not a valid SASL PLAIN response, throw error? + } else { + QPID_LOG(error, "Invalid PLAIN request, null delimiter not found in response data"); + return FAIL; + } if (!uid.empty()) { //append realm if it has not already been added i = uid.find(realm); |