diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2014-07-17 19:48:49 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2014-07-17 19:48:49 +0000 |
| commit | 4e933ccda6cc61773277ce274f42336ba4a3a2e1 (patch) | |
| tree | 7c7063bf812392cd773d5b1cdf0c30a3059ad57e /TAO/orbsvcs/tests | |
| parent | a09e1bcb40857353a099d6a881963d61db4e69d4 (diff) | |
| download | ATCD-4e933ccda6cc61773277ce274f42336ba4a3a2e1.tar.gz | |
Thu Jul 17 19:14:51 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>
* orbsvcs/tests/ImplRepo/double_start/client.cpp:
* orbsvcs/tests/ImplRepo/double_start/clt.conf:
add the reply close retry option and update the client output.
* orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp:
Make the test wchar compatible.
Diffstat (limited to 'TAO/orbsvcs/tests')
| -rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/double_start/clt.conf | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp index 56c6a7dee06..fb8ab5050d1 100644 --- a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp @@ -78,6 +78,7 @@ do_restart_test (void) try { test->trigger (); + ACE_DEBUG ((LM_DEBUG, "client trigger completed\n")); return; } catch (const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/clt.conf b/TAO/orbsvcs/tests/ImplRepo/double_start/clt.conf index e012344c13a..6a7ff0060f5 100644 --- a/TAO/orbsvcs/tests/ImplRepo/double_start/clt.conf +++ b/TAO/orbsvcs/tests/ImplRepo/double_start/clt.conf @@ -1 +1 @@ -static Client_Strategy_Factory "-ORBForwardOnObjectNotExistLimit 1 -ORBForwardOnTransientLimit 5 -ORBForwardOnCommFailureLimit 5 -ORBDefaultSyncScope Server -ORBWaitStrategy mt_noupcall" +static Client_Strategy_Factory "-ORBForwardOnObjectNotExistLimit 1 -ORBForwardOnTransientLimit 5 -ORBForwardOnCommFailureLimit 5 -ORBForwardOnReplyClosedLimit 5 -ORBDefaultSyncScope Server -ORBWaitStrategy mt_noupcall" diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp index ab5da467c1c..c266b110909 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp @@ -130,7 +130,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) IORTable::Table_var table = IORTable::Table::_narrow(obj.in()); table->bind(poa_name_base.c_str (), test_ior.in()); - ACE_DEBUG ((LM_DEBUG, "Started Server %s \n", + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Started Server %C \n"), poa_name_base.c_str())); { @@ -149,7 +149,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } catch(const CORBA::Exception& ex) { - ex._tao_print_exception ("Server main()"); + ex._tao_print_exception (ACE_TEXT("Server main()")); return 1; } |