svn commit: r573516 - in /incubator/qpid/branches/M2.1/cpp/lib: broker/SessionHandlerImpl.cpp client/ClientChannel.cpp common/sys/apr/APRSocket.cpp common/sys/apr/LFSessionContext.cpp

[gsim]

Author: gsim
Date: Fri Sep  7 02:19:23 2007
New Revision: 573516

URL: http://svn.apache.org/viewvc?rev=573516&view=rev
Log:
Fixes for QPID-581 & QPID-563


Modified:
    incubator/qpid/branches/M2.1/cpp/lib/broker/SessionHandlerImpl.cpp
    incubator/qpid/branches/M2.1/cpp/lib/client/ClientChannel.cpp
    incubator/qpid/branches/M2.1/cpp/lib/common/sys/apr/APRSocket.cpp
    incubator/qpid/branches/M2.1/cpp/lib/common/sys/apr/LFSessionContext.cpp

Modified: incubator/qpid/branches/M2.1/cpp/lib/broker/SessionHandlerImpl.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/cpp/lib/broker/SessionHandlerImpl.cpp?rev=573516&r1=573515&r2=573516&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/cpp/lib/broker/SessionHandlerImpl.cpp 
(original)
+++ incubator/qpid/branches/M2.1/cpp/lib/broker/SessionHandlerImpl.cpp Fri Sep  
7 02:19:23 2007
@@ -138,8 +138,6 @@
        client = new qpid::framing::AMQP_ClientProxy(context, 
header->getMajor(), header->getMinor());
 
 
-       std::cout << "---------------" << this << std::endl;
-         
        //send connection start
        FieldTable properties;
        string mechanisms("PLAIN");

Modified: incubator/qpid/branches/M2.1/cpp/lib/client/ClientChannel.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/cpp/lib/client/ClientChannel.cpp?rev=573516&r1=573515&r2=573516&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/cpp/lib/client/ClientChannel.cpp (original)
+++ incubator/qpid/branches/M2.1/cpp/lib/client/ClientChannel.cpp Fri Sep  7 
02:19:23 2007
@@ -258,9 +258,7 @@
     
 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 @@
 
     }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;

Modified: incubator/qpid/branches/M2.1/cpp/lib/common/sys/apr/APRSocket.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/cpp/lib/common/sys/apr/APRSocket.cpp?rev=573516&r1=573515&r2=573516&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/cpp/lib/common/sys/apr/APRSocket.cpp (original)
+++ incubator/qpid/branches/M2.1/cpp/lib/common/sys/apr/APRSocket.cpp Fri Sep  
7 02:19:23 2007
@@ -53,7 +53,6 @@
 
 void APRSocket::close(){
     if(!closed){
-        std::cout << "Closing socket " << socket << "@" << this << std::endl;
         CHECK_APR_SUCCESS(apr_socket_close(socket));
         closed = true;
     }

Modified: 
incubator/qpid/branches/M2.1/cpp/lib/common/sys/apr/LFSessionContext.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/cpp/lib/common/sys/apr/LFSessionContext.cpp?rev=573516&r1=573515&r2=573516&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/cpp/lib/common/sys/apr/LFSessionContext.cpp 
(original)
+++ incubator/qpid/branches/M2.1/cpp/lib/common/sys/apr/LFSessionContext.cpp 
Fri Sep  7 02:19:23 2007
@@ -158,7 +158,7 @@
 void LFSessionContext::handleClose(){
     handler->closed();
     APRPool::free(fd.p);
-    std::cout << "Session closed [" << &socket << "]" << std::endl;
+    if (debug) std::cout << "Session closed [" << &socket << "]" << std::endl;
     delete handler;
     delete this;
 }