diff options
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/tao/TAO_Internal.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/Bug_3896_Regression/client.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/Connect_Strategy_Test/client.cpp | 1 |
4 files changed, 14 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index da71b26858c..8cc54ce730d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Sun Apr 6 18:57:09 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/TAO_Internal.cpp: + Fixed formatting of a debug statement consistent + + * tests/Bug_3896_Regression/client.cpp: + * tests/Connect_Strategy_Test/client.cpp: + Print a message in the client before calling shutdown + on the server + Sat Apr 5 19:30:37 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com> * tao/DynamicAny/DynAny_i.cpp: diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index f52e81c49d4..ab88758d119 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -626,7 +626,7 @@ namespace if (TAO_debug_level > 0) { TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) ORB_Core: ") + ACE_TEXT ("TAO (%P|%t) - ORB_Core: ") ACE_TEXT ("Unable to initialize ") ACE_TEXT ("Codeset Manager\n"))); } diff --git a/TAO/tests/Bug_3896_Regression/client.cpp b/TAO/tests/Bug_3896_Regression/client.cpp index 9187ddc46eb..0df5f4ce769 100644 --- a/TAO/tests/Bug_3896_Regression/client.cpp +++ b/TAO/tests/Bug_3896_Regression/client.cpp @@ -94,6 +94,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (shutdown_server) { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Calling shutdown on server\n")); hello->shutdown (); } else diff --git a/TAO/tests/Connect_Strategy_Test/client.cpp b/TAO/tests/Connect_Strategy_Test/client.cpp index ca86ad002ba..91d939dd38e 100644 --- a/TAO/tests/Connect_Strategy_Test/client.cpp +++ b/TAO/tests/Connect_Strategy_Test/client.cpp @@ -67,6 +67,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (do_shutdown) { + ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Going to shutdown server\n")); hello->shutdown (); } |