diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
commit | c801f87e59c00f72bdeb5ce7bd0d276674665bac (patch) | |
tree | 70bff03d1cf156ecf05ee4c5c338d8ce423e64ee /TAO/tests/BiDirectional_DelayedUpcall | |
parent | 98c0b37d4714ff774fc3ada8c9ee893c719af714 (diff) | |
download | ATCD-c801f87e59c00f72bdeb5ce7bd0d276674665bac.tar.gz |
Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests/BiDirectional_DelayedUpcall')
-rw-r--r-- | TAO/tests/BiDirectional_DelayedUpcall/client.cpp | 26 | ||||
-rw-r--r-- | TAO/tests/BiDirectional_DelayedUpcall/server.cpp | 21 | ||||
-rw-r--r-- | TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp | 12 | ||||
-rw-r--r-- | TAO/tests/BiDirectional_DelayedUpcall/test_i.h | 6 |
4 files changed, 17 insertions, 48 deletions
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp index a6b00269d1b..ad33e1782be 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp @@ -47,11 +47,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,11 +58,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the childPOA to be created. CORBA::PolicyList policies (1); @@ -76,7 +72,6 @@ main (int argc, char *argv[]) orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -86,30 +81,25 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -127,19 +117,16 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(callback_impl); Callback_var callback = - callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + callback_impl->_this (); // Send the calback object to the server server->callback_object (callback.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Call the client that will make remote calls to us again, but // not directly, but delayed for a second or so. CORBA::Long r = server->test_method (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (r != 0) { @@ -151,14 +138,11 @@ main (int argc, char *argv[]) // Run now the ORB for 5 seconds ACE_Time_Value run_time (5); orb->run (run_time ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Shutdown the server - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp index ef4c284f576..457ef999087 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp @@ -47,11 +47,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,11 +58,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the childPOA to be created. CORBA::PolicyList policies (1); @@ -76,7 +72,6 @@ main (int argc, char *argv[]) orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE, pol ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA as child of RootPOA with the above policies. This POA // will receive request in the same connection in which it sent @@ -86,19 +81,16 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of childPOA is over. Destroy the Policy objects. for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[i]->destroy (); } - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -117,16 +109,13 @@ main (int argc, char *argv[]) child_poa->activate_object_with_id (id.in (), server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = child_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -144,13 +133,11 @@ main (int argc, char *argv[]) } // Run the event loop - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp index b6c3bc56e36..e0b8233488c 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp @@ -14,7 +14,7 @@ ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$") void -Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Callback_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); @@ -22,7 +22,7 @@ Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) } void -Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Callback_i::callback_method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -44,8 +44,7 @@ Simple_Server_i::handle_timeout (const ACE_Time_Value &, times < this->no_iterations_; ++times) { - this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->callback_->callback_method (); if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1) { @@ -56,8 +55,7 @@ Simple_Server_i::handle_timeout (const ACE_Time_Value &, } } - this->callback_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->callback_->shutdown (); return 0; } @@ -99,7 +97,7 @@ Simple_Server_i::callback_object (Callback_ptr callback void -Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (false ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h index 30b355dcd9c..f78ba42db26 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h +++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h @@ -32,11 +32,11 @@ public: Callback_i (CORBA::ORB_ptr orb); // ctor - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Safe way to shutdown - void callback_method (ACE_ENV_SINGLE_ARG_DECL) + void callback_method (void) ACE_THROW_SPEC ((CORBA::SystemException)); // The callback method @@ -66,7 +66,7 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int handle_timeout (const ACE_Time_Value ¤t_time, |