diff options
| author | Gordon Sim <gsim@apache.org> | 2007-09-12 10:05:46 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2007-09-12 10:05:46 +0000 |
| commit | f9313dcc457a602a26f5f4747d5af104a56252a1 (patch) | |
| tree | fe679e4924eea7607b92162e18bb2384e45ba48c /cpp/lib/client/ClientChannel.cpp | |
| parent | 848e4f986179e3c58d23a7e6558f0d3fc0d71373 (diff) | |
| download | qpid-python-f9313dcc457a602a26f5f4747d5af104a56252a1.tar.gz | |
Applied rev 573516 from M2.1: Fixes for QPID-581 & QPID-563
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@574876 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/lib/client/ClientChannel.cpp')
| -rw-r--r-- | cpp/lib/client/ClientChannel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/lib/client/ClientChannel.cpp b/cpp/lib/client/ClientChannel.cpp index 4ec0d87eeb..a97d79dcf9 100644 --- a/cpp/lib/client/ClientChannel.cpp +++ b/cpp/lib/client/ClientChannel.cpp @@ -258,9 +258,7 @@ void Channel::rollback(){ void Channel::handleMethod(AMQMethodBody::shared_ptr body){ //channel.flow, channel.close, basic.deliver, basic.return or a response to a synchronous request - if(responses.isWaiting()){ - responses.signalResponse(body); - }else if(method_bodies.basic_deliver.match(body.get())){ + if(method_bodies.basic_deliver.match(body.get())){ if(incoming != 0){ std::cout << "Existing message not complete [deliveryTag=" << incoming->getDeliveryTag() << "]" << std::endl; THROW_QPID_ERROR(PROTOCOL_ERROR + 504, "Existing message not complete"); @@ -280,6 +278,8 @@ void Channel::handleMethod(AMQMethodBody::shared_ptr body){ }else if(method_bodies.channel_flow.match(body.get())){ + } else if(responses.isWaiting()){ + responses.signalResponse(body); }else{ //signal error std::cout << "Unhandled method: " << *body << std::endl; |