diff options
| author | harrisb <harrisb@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-03-28 15:32:44 +0000 |
|---|---|---|
| committer | harrisb <harrisb@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-03-28 15:32:44 +0000 |
| commit | 64819aaa452a403bcd504f4454956d0654026ed7 (patch) | |
| tree | 3680aeb5f38d48d2a06a9e969b03e93af298d13b /TAO/orbsvcs | |
| parent | 1f98d64c3e75c1edeed26d6960ee1672efbf8686 (diff) | |
| download | ATCD-64819aaa452a403bcd504f4454956d0654026ed7.tar.gz | |
Thu Mar 28 15:25:46 UTC 2013 Byron Harris <harrisb@ociweb.com>
Diffstat (limited to 'TAO/orbsvcs')
4 files changed, 9 insertions, 8 deletions
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp index b911ccfaca5..b623f0e3c55 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp @@ -1,6 +1,7 @@ /* -*- C++ -*- $Id$ */ #include "Test_i.h" +#include "ace/OS_NS_unistd.h" Test_i::Test_i (CORBA::Short server_num, CORBA::Short reply_delay_secs) diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp index 1bdafe6b282..75a025f8551 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp @@ -6,7 +6,7 @@ #include "ace/OS_NS_unistd.h" int client_num = 0; -ACE_CString server_ior; +ACE_TCHAR *server_ior = 0; int parse_args (int argc, ACE_TCHAR *argv[]) @@ -50,9 +50,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t|%T) Client %d sending request to %s\n", - client_num, server_ior.c_str ())); + client_num, server_ior)); CORBA::Object_var obj = - orb->string_to_object (server_ior.c_str ()); + orb->string_to_object (server_ior); ACE_ASSERT (!CORBA::is_nil (obj.in ())); Test_var test = Test::_narrow (obj.in()); ACE_ASSERT (!CORBA::is_nil (test.in())); diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl index 73783d38303..0975d46b500 100755 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl @@ -15,7 +15,7 @@ my $debug_level = '0'; my $imr_debug_level = $debug_level; my $servers_count = 3; my $client_count = 2; -my $server_reply_delay = 5; +my $server_reply_delay = 20; my $usage = 0; # Ping interval in milliseconds diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp index fe6e8980ca7..08210a261cf 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp @@ -50,7 +50,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) try { CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); - ACE_CString other_server_ior; + ACE_TCHAR *other_server_ior = 0; int server_num = 0; int reply_delay_secs = 0; @@ -124,13 +124,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) table->bind(poa_name.c_str (), test_ior.in()); // Make invocation to other server before POA is activated. - if (other_server_ior.length () > 0) + if (other_server_ior != 0) { ACE_DEBUG ((LM_DEBUG, "(%P|%t|%T) Server %d sending request to %s\n", - server_num, other_server_ior.c_str ())); + server_num, other_server_ior)); CORBA::Object_var other_server = - orb->string_to_object (other_server_ior.c_str ()); + orb->string_to_object (other_server_ior); ACE_ASSERT (!CORBA::is_nil (other_server.in ())); Test_var test = Test::_narrow (other_server.in()); ACE_ASSERT (!CORBA::is_nil (test.in())); |