diff options
| author | Alan Conway <aconway@apache.org> | 2007-02-17 03:46:44 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-02-17 03:46:44 +0000 |
| commit | f972bfa6c7c9a1b3d5f5fe4753dce7358b6b0215 (patch) | |
| tree | a3d37ef1999eb4ebdb8bb9d6eaea8b2d3de5dfe2 /cpp/lib/client/ClientChannel.cpp | |
| parent | 72de13352dc9c42acfe95a1d76f049c507eb5cfd (diff) | |
| download | qpid-python-f972bfa6c7c9a1b3d5f5fe4753dce7358b6b0215.tar.gz | |
* 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
Diffstat (limited to 'cpp/lib/client/ClientChannel.cpp')
| -rw-r--r-- | cpp/lib/client/ClientChannel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/lib/client/ClientChannel.cpp b/cpp/lib/client/ClientChannel.cpp index 9d1c8ec011..4dff8a62f7 100644 --- a/cpp/lib/client/ClientChannel.cpp +++ b/cpp/lib/client/ClientChannel.cpp @@ -245,7 +245,7 @@ void Channel::retrieve(Message& msg){ msg.header = retrieved->getHeader(); msg.deliveryTag = retrieved->getDeliveryTag(); - retrieved->getData(msg.data); + msg.data = retrieved->getData(); delete retrieved; retrieved = 0; } @@ -446,7 +446,7 @@ void Channel::dispatch(){ if(incomingMsg){ //Note: msg is currently only valid for duration of this call Message msg(incomingMsg->getHeader()); - incomingMsg->getData(msg.data); + msg.data = incomingMsg->getData(); if(incomingMsg->isReturn()){ if(returnsHandler == 0){ //print warning to log/console |