diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-24 20:09:59 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-24 20:09:59 +0000 |
| commit | 2129cd67e34ff7e3b8e02671bfad72fce3dc7194 (patch) | |
| tree | a78e8e01d06f8a044e487126be760e0c78952ce0 /TAO/tao/IIOP_Connect.cpp | |
| parent | b47d4beceb791e87da7cc26a98e5e47a3756cae9 (diff) | |
| download | ATCD-2129cd67e34ff7e3b8e02671bfad72fce3dc7194.tar.gz | |
Thu Jun 24 14:53:32 1999 Irfan Pyarali <irfan@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/IIOP_Connect.cpp')
| -rw-r--r-- | TAO/tao/IIOP_Connect.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/TAO/tao/IIOP_Connect.cpp b/TAO/tao/IIOP_Connect.cpp index 2610640b002..953c551eecb 100644 --- a/TAO/tao/IIOP_Connect.cpp +++ b/TAO/tao/IIOP_Connect.cpp @@ -28,10 +28,7 @@ ACE_RCSID(tao, Connect, "$Id$") "Server_Connection_Handler::receive_request - end", "IIOP_Client_Connection_Handler::send_request - start", - "IIOP_Client_Connection_Handler::send_request - end", - - "GIOP::Send_Request - return" -}; + "IIOP_Client_Connection_Handler::send_request - end"}; enum { @@ -45,9 +42,7 @@ enum TAO_SERVER_CONNECTION_HANDLER_RECEIVE_REQUEST_END, TAO_IIOP_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START, - TAO_IIOP_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_END, - - GIOP_SEND_REQUEST_RETURN + TAO_IIOP_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_END }; // Setup Timeprobes @@ -247,12 +242,16 @@ TAO_IIOP_Server_Connection_Handler::handle_input (ACE_HANDLE) if (result == 0 || result == -1) return result; - TAO_GIOP::process_server_message (this->transport (), - this->orb_core_, - this->transport_->message_state_.cdr, - this->transport_->message_state_); - this->transport_->message_state_.reset (); - return 0; + result = TAO_GIOP::process_server_message (this->transport (), + this->orb_core_, + this->transport_->message_state_.cdr, + this->transport_->message_state_); + if (result != -1) + { + this->transport_->message_state_.reset (); + } + + return result; } // **************************************************************** |