diff options
Diffstat (limited to 'orbsvcs/tests/ImplRepo/ReconnectServer')
6 files changed, 26 insertions, 30 deletions
diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp b/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp index 948d9e7102f..b54d49e1e3d 100755 --- a/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp +++ b/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp @@ -9,9 +9,6 @@ #include "ORB_Task.h" #include "tao/Environment.h" -ACE_RCSID (ReconnectServer, - ORB_Task, "$Id$") - ORB_Task::ORB_Task (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp b/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp index 4efc786b6a0..bc61035a1b9 100755 --- a/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp +++ b/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp @@ -3,12 +3,11 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" #include <ace/Task.h> -#include <ace/OS.h> - +#include "ace/OS_NS_unistd.h" const ACE_TCHAR *ior_input_file = ACE_TEXT ("file://serverA.ior"); int test_duration_sec = 15; -bool expect_object_not_exist = false; +bool expect_object_not_exist = false; class Client_Task : public ACE_Task_Base { @@ -23,7 +22,7 @@ class Client_Task : public ACE_Task_Base virtual int svc (void) { ACE_Time_Value start = ACE_OS::gettimeofday (); - ACE_Time_Value elapsed; + ACE_Time_Value elapsed; int i = 0; while (elapsed < ACE_Time_Value (test_duration_sec)) { @@ -45,7 +44,7 @@ class Client_Task : public ACE_Task_Base caught_object_not_exist_ = true; ACE_OS::sleep (1); } - catch (const CORBA::Exception & /*ex*/) + catch (const CORBA::Exception & /*ex*/) { //ex._tao_print_exception ("Exception caught:"); communication_failed_ = true; @@ -54,7 +53,7 @@ class Client_Task : public ACE_Task_Base ++i; elapsed = ACE_OS::gettimeofday () - start; } - + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)Client thread exit \n"))); return 0; } @@ -102,14 +101,14 @@ parse_args (int argc, ACE_TCHAR* argv[]) argv [0]), -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); @@ -137,7 +136,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) Client_Task task (test.in ()); task.activate (THR_NEW_LWP | THR_JOINABLE, 1, 1); - + ACE_Time_Value tv(test_duration_sec); orb->run (&tv); @@ -156,7 +155,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t)Client test failed.\n")), 1); } } - catch (const CORBA::Exception &ex) + catch (const CORBA::Exception &ex) { ex._tao_print_exception ("Exception caught by client:"); return 1; diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl b/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl index dc0bf0c1061..9d89fcd08cf 100755 --- a/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl +++ b/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl @@ -67,7 +67,7 @@ $srvb->DeleteFile ($srvbiorfile); $cli->DeleteFile ($srvaiorfile); -$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/ImplRepo_Service", +$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator", "-ORBEndpoint "."$protocol"."://:".$port." ". "-UnregisterIfAddressReused ". "-d $imr_debug_level ". diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp b/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp index 5ec4ae92f9b..e42e5b9f394 100755 --- a/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp +++ b/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp @@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) argv [0]), -1); } - + return 0; } @@ -51,7 +51,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) rootPOA->the_POAManager (); CORBA::PolicyList policies (5); - policies.length (5); + policies.length (5); // Lifespan policy policies[0] = @@ -116,7 +116,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) rootPOA->destroy (1, 1); orb->destroy (); } - catch (const CORBA::Exception &ex) + catch (const CORBA::Exception &ex) { ex._tao_print_exception ("Exception caught by serverA:"); return 1; diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp b/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp index 2049cc94590..06f6c1fe2a2 100755 --- a/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp +++ b/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp @@ -4,7 +4,7 @@ #include "tao/ImR_Client/ImR_Client.h" #include <ace/Task.h> #include <ace/Get_Opt.h> -#include <ace/OS.h> +#include "ace/OS_NS_unistd.h" const ACE_TCHAR * ior_output_file = ACE_TEXT ("serverB.ior"); // server_notify_delay between resolving RootPOA init ref and create_POA. @@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) argv [0]), -1); } - + return 0; } @@ -64,7 +64,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) rootPOA->the_POAManager (); CORBA::PolicyList policies (5); - policies.length (5); + policies.length (5); // Lifespan policy policies[0] = @@ -131,7 +131,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) rootPOA->destroy (1, 1); orb->destroy (); } - catch (const CORBA::Exception &ex) + catch (const CORBA::Exception &ex) { ex._tao_print_exception ("Exception caught by serverB:"); return 1; diff --git a/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h b/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h index ccb9c6c524c..4c0e0ef2ceb 100755 --- a/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h +++ b/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h @@ -13,12 +13,12 @@ class Test_Dummy_i : public virtual POA_Test::Dummy { public: - // Constructor + // Constructor Test_Dummy_i (void); - - // Destructor + + // Destructor virtual ~Test_Dummy_i (void); - + virtual char * getMessage (void); }; @@ -26,17 +26,17 @@ class Test_Time_i : public virtual POA_Test::Time { public: - // Constructor + // Constructor Test_Time_i (void); - - // Destructor + + // Destructor virtual ~Test_Time_i (void); - + virtual ::CORBA::Long current_time ( void ); - + virtual void shutdown ( void |