diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-12-17 10:23:30 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-12-17 10:23:30 +0000 |
| commit | 4b190fb8f8c6f0e1b19345f57dfb1f43db6f6de4 (patch) | |
| tree | 078cdb8fd930580cb3630a15c090c4c23aeadc54 /TAO/tao | |
| parent | 139c1978575a11779a87e70843b0d56a8fb50fe8 (diff) | |
| download | ATCD-4b190fb8f8c6f0e1b19345f57dfb1f43db6f6de4.tar.gz | |
Thu Dec 17 10:22:00 UTC 2009 Martin Corino <mcorino@remedy.nl>
* tao/GIOP_Message_Base.cpp:
Fixed missing request id in logging of LocateRequest/LocateReply &
CancelRequest.
This fixed Bugzilla #2898.
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/GIOP_Message_Base.cpp | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index c93f6d9f35b..59bdd2d7506 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -1556,19 +1556,37 @@ TAO_GIOP_Message_Base::dump_msg (const char *label, tmp_id = (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN); } #if !defined (ACE_DISABLE_SWAP_ON_READ) - if (byte_order == TAO_ENCAP_BYTE_ORDER) - { - id = reinterpret_cast <ACE_CDR::ULong*> (tmp_id); - } - else - { - ACE_CDR::swap_4 (tmp_id, reinterpret_cast <char*> (id)); - } + if (byte_order == TAO_ENCAP_BYTE_ORDER) + { + id = reinterpret_cast <ACE_CDR::ULong*> (tmp_id); + } + else + { + ACE_CDR::swap_4 (tmp_id, reinterpret_cast <char*> (id)); + } #else - id = reinterpret_cast <ACE_CDR::ULong*> (tmp_id); + id = reinterpret_cast <ACE_CDR::ULong*> (tmp_id); #endif /* ACE_DISABLE_SWAP_ON_READ */ } + else if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == GIOP::CancelRequest || + ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == GIOP::LocateRequest || + ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == GIOP::LocateReply) + { + tmp_id = (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN); +#if !defined (ACE_DISABLE_SWAP_ON_READ) + if (byte_order == TAO_ENCAP_BYTE_ORDER) + { + id = reinterpret_cast <ACE_CDR::ULong*> (tmp_id); + } + else + { + ACE_CDR::swap_4 (tmp_id, reinterpret_cast <char*> (id)); + } +#else + id = reinterpret_cast <ACE_CDR::ULong*> (tmp_id); +#endif /* ACE_DISABLE_SWAP_ON_READ */ + } // Print. ACE_DEBUG ((LM_DEBUG, |