diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-12 18:44:52 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-12 18:44:52 +0000 |
| commit | 65461150e149acff13e963cbee6b54d36c2e5806 (patch) | |
| tree | 71d1e8b7b865078f931675066203b4adf6ecfa8b | |
| parent | e5c3920a1aa48fd0e1d68a27525de4931c2131bb (diff) | |
| download | ATCD-65461150e149acff13e963cbee6b54d36c2e5806.tar.gz | |
Fri Jun 12 18:44:04 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/IIOP_Acceptor.cpp:
Improved logging layout
* tao/Invocation_Adapter.cpp:
Use ACE_TEXT
* tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
Layout changes
| -rw-r--r-- | TAO/ChangeLog | 13 | ||||
| -rw-r--r-- | TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp | 5 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Acceptor.cpp | 12 | ||||
| -rw-r--r-- | TAO/tao/Invocation_Adapter.cpp | 4 |
4 files changed, 22 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7a31ec34c06..4a8b07af902 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,7 +1,18 @@ +Fri Jun 12 18:44:04 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/IIOP_Acceptor.cpp: + Improved logging layout + + * tao/Invocation_Adapter.cpp: + Use ACE_TEXT + + * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp: + Layout changes + Fri Jun 12 16:12:36 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com> * utils/logWalker/logWalker.mpc: - + Cannot build on ace_for_tao platforms. Fri Jun 12 14:29:55 UTC 2009 Adam Mitz <mitza@ociweb.com> diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp index c66188f0f49..5cc472a9cf9 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp @@ -253,8 +253,7 @@ TAO_AMH_DSI_Exception_Holder::_tao_any_destructor (void *_tao_void_pointer) CORBA::Boolean TAO_AMH_DSI_Exception_Holder::_tao_unmarshal ( TAO_InputCDR &strm, - TAO_AMH_DSI_Exception_Holder *&new_object - ) + TAO_AMH_DSI_Exception_Holder *&new_object) { CORBA::ValueBase *base = 0; CORBA::ValueFactory_var factory; @@ -265,7 +264,7 @@ TAO_AMH_DSI_Exception_Holder::_tao_unmarshal ( TAO_AMH_DSI_Exception_Holder::_tao_obv_static_repository_id () ); - if (retval == 0) + if (!retval) { return false; } diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index d831ae84399..6e007a4e283 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -473,8 +473,8 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ") - ACE_TEXT ("%p, "), - ACE_TEXT ("cannot open acceptor\n"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("cannot open acceptor"))); return -1; } } @@ -559,8 +559,8 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ") - ACE_TEXT ("%p"), - ACE_TEXT ("cannot get local addr\n"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("cannot get local addr"))); return -1; } @@ -831,8 +831,8 @@ TAO_IIOP_Acceptor::dotted_decimal_address (const ACE_INET_Addr &addr, ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("IIOP_Acceptor::dotted_decimal_address, ") - ACE_TEXT ("- %p, "), - ACE_TEXT ("cannot determine hostname\n"))); + ACE_TEXT ("- %p\n"), + ACE_TEXT ("cannot determine hostname"))); return -1; } diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index 0100e76592a..cb79b83a2d9 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -112,8 +112,8 @@ namespace TAO if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Invocation_Adapter::invoke_i, " - "handling forwarded locations\n")); + ACE_TEXT("TAO (%P|%t) - Invocation_Adapter::invoke_i, ") + ACE_TEXT("handling forwarded locations\n"))); } } } |