* cpp/lib/client/ClientMessage.h/.cpp: Added Message constructor taking data.

* cpp/lib/client/IncomingMessage.cpp: Simplified message aggregation.
* cpp/lib/common/framing/AMQ*Body.h: remove unnecessary virtual inheritance.
* cpp/lib/common/framing/AMQMethodBody.h: add bool isRequest, isResponse
* cpp/lib/common/sys/Mutex.h (class ScopedUnlock): Added ScopedUnlock
* cpp/lib/common/sys/ThreadSafeQueue.h: Thread-safe queue template.
* cpp/tests/BrokerChannelTest.cpp: Renamed from ChannelTest.
* cpp/tests/ClientChannelTest.cpp: Test client API.
* cpp/tests/RequestResponseTest.cpp: Removed empty test.
* cpp/lib/client/Connection.h,.cpp:
 - non-static channelIdCounter
 - No close() in dtor.


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

1 files changed, 2 insertions, 6 deletions

diff --git a/cpp/lib/client/Connection.cpp b/cpp/lib/client/Connection.cpp
index 2f91c44a22..5b97ca8e5d 100644
--- a/cpp/lib/client/Connection.cpp
+++ b/cpp/lib/client/Connection.cpp
@@ -37,23 +37,19 @@ using namespace qpid::sys;
 namespace qpid {
 namespace client {
 
-ChannelId Connection::channelIdCounter;
-
 const std::string Connection::OK("OK");
 
 Connection::Connection(
     bool _debug, u_int32_t _max_frame_size,
     framing::ProtocolVersion _version
-) : version(_version), max_frame_size(_max_frame_size),
+) : channelIdCounter(0), version(_version), max_frame_size(_max_frame_size),
     defaultConnector(version, _debug, _max_frame_size),
     isOpen(false), debug(_debug)
 {
     setConnector(defaultConnector);
 }
 
-Connection::~Connection(){
-    close();
-}
+Connection::~Connection(){}
 
 void Connection::setConnector(Connector& con)
 {