* Added support for channel.flow:

    cpp/tests/ChannelTest.cpp
    cpp/lib/broker/SessionHandlerImpl.cpp
    cpp/lib/broker/BrokerChannel.h
    cpp/lib/broker/BrokerChannel.cpp

* Fixed client connection closing process:
    cpp/lib/common/sys/apr/Socket.cpp
    cpp/lib/client/Connector.h
    cpp/lib/client/Connector.cpp
    cpp/lib/client/Connection.h
    cpp/lib/client/Connection.cpp

* Use amq.direct rather than default exchange in P2P test 
  (to interop with java)
    cpp/tests/BasicP2Ptest.h



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

1 files changed, 4 insertions, 5 deletions

diff --git a/cpp/lib/broker/SessionHandlerImpl.cpp b/cpp/lib/broker/SessionHandlerImpl.cpp
index 49767f4c71..b91bee5a4b 100644
--- a/cpp/lib/broker/SessionHandlerImpl.cpp
+++ b/cpp/lib/broker/SessionHandlerImpl.cpp
@@ -233,12 +233,11 @@ void SessionHandlerImpl::ChannelHandlerImpl::open(u_int16_t channel, const strin
     }
 } 
         
-void SessionHandlerImpl::ChannelHandlerImpl::flow(u_int16_t /*channel*/, bool /*active*/){
-
+void SessionHandlerImpl::ChannelHandlerImpl::flow(u_int16_t channel, bool active){
+    parent->getChannel(channel)->flow(active);
+    parent->client->getChannel().flowOk(channel, active);    
 }         
-void SessionHandlerImpl::ChannelHandlerImpl::flowOk(u_int16_t /*channel*/, bool /*active*/){
-
-} 
+void SessionHandlerImpl::ChannelHandlerImpl::flowOk(u_int16_t /*channel*/, bool /*active*/){} 
         
 void SessionHandlerImpl::ChannelHandlerImpl::close(u_int16_t channel, u_int16_t /*replyCode*/, const string& /*replyText*/, 
                                                    u_int16_t /*classId*/, u_int16_t /*methodId*/){