diff options
Diffstat (limited to 'TAO/tao/GIOP_Message_Base.cpp')
| -rw-r--r-- | TAO/tao/GIOP_Message_Base.cpp | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 7e89fce4ba5..84a8ec26914 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -882,7 +882,9 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, return -1; } - int result = transport->send_message (output); + int result = transport->send_message (output, + 0, + TAO_Transport::TAO_REPLY); if (result == -1) { if (TAO_debug_level > 0) @@ -1154,7 +1156,9 @@ TAO_GIOP_Message_Base::make_send_locate_reply (TAO_Transport *transport, status_info); // Send the message - int result = transport->send_message (output); + int result = transport->send_message (output, + 0, + TAO_Transport::TAO_REPLY); // Print out message if there is an error if (result == -1) @@ -1387,7 +1391,9 @@ TAO_GIOP_Message_Base::send_reply_exception ( *x) == -1) return -1; - return transport->send_message (output); + return transport->send_message (output, + 0, + TAO_Transport::TAO_REPLY); } void @@ -1427,22 +1433,33 @@ TAO_GIOP_Message_Base::dump_msg (const char *label, // request/reply id. CORBA::ULong tmp = 0; CORBA::ULong *id = &tmp; + char *tmp_id = 0; if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REQUEST || ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REPLY) { - // @@ Only works if ServiceContextList is empty.... if (minor < 2) { - id = ACE_reinterpret_cast (CORBA::ULong *, - (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN + 4)); - + // @@ Only works if ServiceContextList is empty.... + tmp_id = (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN + 4); } else { - id = ACE_reinterpret_cast (CORBA::ULong *, - (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN)); + tmp_id = (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN); } +#if !defined (ACE_DISABLE_SWAP_ON_READ) + if (byte_order == TAO_ENCAP_BYTE_ORDER) + { + id = ACE_reinterpret_cast (ACE_CDR::ULong*, tmp_id); + } + else + { + ACE_CDR::swap_4 (tmp_id, ACE_reinterpret_cast (char*,id)); + } +#else + id = ACE_reinterpret_cast(ACE_CDR::ULong*, tmp_id); +#endif /* ACE_DISABLE_SWAP_ON_READ */ + } // Print. |