* Added ClientAdapter - client side ChannelAdapter. Updated client side.

* Moved ChannelAdapter initialization from ctor to init(), updated broker side.
* Improved various exception messages with boost::format messages.
* Removed unnecssary virtual inheritance.
* Widespread: fixed incorrect non-const ProtocolVersion& parameters.
* Client API: pass channels by reference, not pointer.
* codegen:
 - MethodBodyClass.h.templ: Added CLASS_ID, METHOD_ID and isA() template.
 - Various: fixed non-const ProtocolVersion& parameters.
* cpp/bootstrap: Allow config arguments with -build.
* cpp/gen/Makefile.am: Merged codegen fixes from trunk.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@501087 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 11 deletions

diff --git a/cpp/tests/client_test.cpp b/cpp/tests/client_test.cpp
index aaa7f4e9ca..bd8519db86 100644
--- a/cpp/tests/client_test.cpp
+++ b/cpp/tests/client_test.cpp
@@ -63,7 +63,7 @@ public:
 int main(int argc, char**)
 {
     verbose = argc > 1;
-    try{               
+    try {
         //Use a custom exchange
 	Exchange exchange("MyExchange", Exchange::TOPIC_EXCHANGE);
         //Use a named, temporary queue
@@ -78,7 +78,7 @@ int main(int argc, char**)
         //Create and open a channel on the connection through which
         //most functionality is exposed
 	Channel channel;      
-	con.openChannel(&channel);
+	con.openChannel(channel);
 	if (verbose) std::cout << "Opened channel." << std::endl;	
 
         //'declare' the exchange and the queue, which will create them
@@ -125,17 +125,13 @@ int main(int argc, char**)
         }
         
         //close the channel & connection
-	con.closeChannel(&channel);
+	channel.close();
 	if (verbose) std::cout << "Closed channel." << std::endl;
 	con.close();	
 	if (verbose) std::cout << "Closed connection." << std::endl;
-    }catch(qpid::QpidError error){
-	if (verbose) std::cout
-            << "Error [" << error.code << "] "
-            << error.msg << " ("
-            << error.location.file << ":" << error.location.line
-            << ")" << std::endl;
-	return 1;
-    }
     return 0;
+    } catch(const std::exception& e) {
+	std::cout << e.what() << std::endl;
+    }
+    return 1;
 }