diff options
Diffstat (limited to 'TAO/tao/GIOP_Message_Lite.cpp')
| -rw-r--r-- | TAO/tao/GIOP_Message_Lite.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index 55c1159bed2..182b8033dbd 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -605,9 +605,8 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD; reply_params.svc_ctx_.length (0); - // Sending back the same service context list we received in the - // Request. (Important for RT CORBA). - reply_params.service_context_notowned (&request.service_info ()); + // Send back the reply service context list. + reply_params.service_context_notowned (&request.reply_service_info ()); // Make the GIOP header and Reply header this->generate_reply_header (*this->output_, @@ -641,7 +640,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, result = this->send_reply_exception (transport, orb_core, request_id, - &request.service_info (), + &request.reply_service_info (), &ACE_ANY_EXCEPTION); if (result == -1) { @@ -701,7 +700,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, result = this->send_reply_exception (transport, orb_core, request_id, - &request.service_info (), + &request.reply_service_info (), &exception); if (result == -1) { @@ -1290,8 +1289,8 @@ TAO_GIOP_Message_Lite::send_reply_exception ( // Close the handle. ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception, handle = %d: %p\n"), - transport->handle (), + ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception on transport %lu: %p\n"), + transport->id (), ACE_TEXT ("send_reply_exception ()"))); return -1; } @@ -1355,8 +1354,6 @@ TAO_GIOP_Message_Lite::send_error (TAO_Transport *transport) (const u_char *) error_message, TAO_GIOP_LITE_HEADER_LEN); - ACE_HANDLE which = transport->handle (); - ACE_Data_Block data_block (TAO_GIOP_LITE_HEADER_LEN, ACE_Message_Block::MB_DATA, error_message, @@ -1374,8 +1371,8 @@ TAO_GIOP_Message_Lite::send_error (TAO_Transport *transport) { ACE_DEBUG (( LM_DEBUG, - ACE_TEXT ("TAO (%N|%l|%P|%t) error sending error to %d\n"), - which + ACE_TEXT ("TAO (%N|%l|%P|%t) error sending error to transport %lu, errno = %d\n"), + transport->id (), errno )); } } |