You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2010/06/02 23:21:39 UTC
svn commit: r950763 - in /qpid/trunk/qpid/cpp/src:
qpid/messaging/Connection.cpp tests/qpid_receive.cpp tests/qpid_send.cpp
Author: aconway
Date: Wed Jun 2 21:21:38 2010
New Revision: 950763
URL: http://svn.apache.org/viewvc?rev=950763&view=rev
Log:
Fix error string for invalid options, fix exception handling in qpid_send/qpid_receive.
Modified:
qpid/trunk/qpid/cpp/src/qpid/messaging/Connection.cpp
qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp
qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/Connection.cpp?rev=950763&r1=950762&r2=950763&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/Connection.cpp Wed Jun 2 21:21:38 2010
@@ -46,7 +46,7 @@ Connection::Connection(const std::string
if (o.empty() || parser.parseMap(options)) {
PI::ctor(*this, new qpid::client::amqp0_10::ConnectionImpl(url, options));
} else {
- throw InvalidOptionString(o);
+ throw InvalidOptionString("Invalid option string: " + o);
}
}
Connection::Connection(const std::string& url, const Variant::Map& options)
Modified: qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp?rev=950763&r1=950762&r2=950763&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpid_receive.cpp Wed Jun 2 21:21:38 2010
@@ -103,7 +103,7 @@ struct Options : public qpid::Options
("report-total", qpid::optValue(reportTotal), "Report total throughput and latency statistics")
("report-every", qpid::optValue(reportEvery,"N"), "Report throughput and latency statistics every N messages.")
("report-header", qpid::optValue(reportHeader, "yes|no"), "Headers on report.") ("ready-address", qpid::optValue(readyAddress, "ADDRESS"),
- "send a message to this address when ready to receive")
+ "send a message to this address when ready to receive")
("help", qpid::optValue(help), "print this usage statement");
add(log);
}
@@ -162,10 +162,11 @@ using namespace qpid::tests;
int main(int argc, char ** argv)
{
- Options opts;
- if (opts.parse(argc, argv)) {
- Connection connection(opts.url, opts.connectionOptions);
- try {
+ Connection connection;
+ try {
+ Options opts;
+ if (opts.parse(argc, argv)) {
+ connection = Connection(opts.url, opts.connectionOptions);
connection.open();
std::auto_ptr<FailoverUpdates> updates(opts.failoverUpdates ? new FailoverUpdates(connection) : 0);
Session session = opts.tx ? connection.createTransactionalSession() : connection.createSession();
@@ -227,10 +228,10 @@ int main(int argc, char ** argv)
session.close();
connection.close();
return 0;
- } catch(const std::exception& error) {
- std::cerr << "Failure: " << error.what() << std::endl;
- connection.close();
}
+ } catch(const std::exception& error) {
+ std::cerr << "Failure: " << error.what() << std::endl;
+ connection.close();
+ return 1;
}
- return 1;
}
Modified: qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp?rev=950763&r1=950762&r2=950763&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpid_send.cpp Wed Jun 2 21:21:38 2010
@@ -247,10 +247,11 @@ class MapContentGenerator : public Con
int main(int argc, char ** argv)
{
+ Connection connection;
Options opts;
- if (opts.parse(argc, argv)) {
- Connection connection(opts.url, opts.connectionOptions);
- try {
+ try {
+ if (opts.parse(argc, argv)) {
+ connection = Connection(opts.url, opts.connectionOptions);
connection.open();
std::auto_ptr<FailoverUpdates> updates(opts.failoverUpdates ? new FailoverUpdates(connection) : 0);
Session session = opts.tx ? connection.createTransactionalSession() : connection.createSession();
@@ -327,10 +328,10 @@ int main(int argc, char ** argv)
session.close();
connection.close();
return 0;
- } catch(const std::exception& error) {
- std::cout << "Failed: " << error.what() << std::endl;
- connection.close();
}
+ } catch(const std::exception& error) {
+ std::cout << "Failed: " << error.what() << std::endl;
+ connection.close();
+ return 1;
}
- return 1;
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org