diff options
Diffstat (limited to 'TAO/tests/POA')
24 files changed, 142 insertions, 562 deletions
diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp index a12ae327ee7..7fffa5a0c1b 100644 --- a/TAO/tests/POA/Bug_2511_Regression/server.cpp +++ b/TAO/tests/POA/Bug_2511_Regression/server.cpp @@ -32,13 +32,13 @@ public: test_i (PortableServer::POA_ptr poa); - void normal (ACE_ENV_SINGLE_ARG_DECL) + void normal (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void exceptional (ACE_ENV_SINGLE_ARG_DECL) + void exceptional (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void notexisting (ACE_ENV_SINGLE_ARG_DECL) + void notexisting (void) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::POA_var poa_; @@ -50,21 +50,21 @@ test_i::test_i (PortableServer::POA_ptr poa) } void -test_i::normal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::normal (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "executing normal\n")); } void -test_i::exceptional (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::exceptional (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "executing exceptional\n")); } void -test_i::notexisting (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::notexisting (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "executing notexisting\n")); @@ -171,24 +171,19 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.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 (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::PolicyList policies; CORBA::ULong current_length = 0; @@ -197,31 +192,26 @@ main (int argc, char **argv) policies[current_length++] = root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies.length (current_length + 1); policies[current_length++] = root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies.length (current_length + 1); policies[current_length++] = root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Servant_Locator* servant_locator = new Servant_Locator(child_poa.in ()) ; child_poa->set_servant_manager (servant_locator ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var objectID = PortableServer::string_to_ObjectId ("object"); @@ -230,12 +220,10 @@ main (int argc, char **argv) child_poa->create_reference_with_id (objectID.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var testObject = test::_narrow (objectREF.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; testObject->normal(); diff --git a/TAO/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp index cfb3e541f38..75a3fccd76d 100644 --- a/TAO/tests/POA/Current/Current.cpp +++ b/TAO/tests/POA/Current/Current.cpp @@ -35,29 +35,24 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var object; object = orb->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::Current_var current = PortableServer::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s successful\n", @@ -70,7 +65,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/Deactivate_Object/Hello.cpp b/TAO/tests/POA/Deactivate_Object/Hello.cpp index 8c6b6e980bc..399e615c228 100644 --- a/TAO/tests/POA/Deactivate_Object/Hello.cpp +++ b/TAO/tests/POA/Deactivate_Object/Hello.cpp @@ -11,7 +11,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); diff --git a/TAO/tests/POA/Deactivate_Object/Hello.h b/TAO/tests/POA/Deactivate_Object/Hello.h index 8ee25ebc312..436fdfcd77f 100644 --- a/TAO/tests/POA/Deactivate_Object/Hello.h +++ b/TAO/tests/POA/Deactivate_Object/Hello.h @@ -17,7 +17,7 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/POA/Deactivate_Object/server.cpp b/TAO/tests/POA/Deactivate_Object/server.cpp index 13749603e33..c601d1dfb1f 100644 --- a/TAO/tests/POA/Deactivate_Object/server.cpp +++ b/TAO/tests/POA/Deactivate_Object/server.cpp @@ -14,15 +14,12 @@ 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; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -30,8 +27,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Hello *hello_impl = 0; ACE_NEW_RETURN (hello_impl, @@ -40,29 +36,23 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(hello_impl); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); PortableServer::ObjectId_var obj_id = root_poa->activate_object (hello_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj_var = root_poa->id_to_reference (obj_id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var new_obj_id = root_poa->reference_to_id (obj_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Invoke reference_to_servant(). Should retrieve servant. PortableServer::ServantBase_var servant = root_poa->reference_to_servant (obj_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Assert correctness. ACE_ASSERT (hello_impl == servant.in()); root_poa->deactivate_object (new_obj_id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.cpp b/TAO/tests/POA/Default_Servant/Default_Servant.cpp index d0de0aad007..4e858447ae1 100644 --- a/TAO/tests/POA/Default_Servant/Default_Servant.cpp +++ b/TAO/tests/POA/Default_Servant/Default_Servant.cpp @@ -34,8 +34,7 @@ test_get_servant_manager (PortableServer::POA_ptr poa) // Getting the servant manager should give a wrong policy exception // exception PortableServer::ServantManager_ptr servant_manager = - poa->get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa->get_servant_manager (); ACE_UNUSED_ARG (servant_manager); } @@ -64,7 +63,6 @@ test_set_servant_manager (PortableServer::POA_ptr poa) // Setting the servant manager should give a wrong policy exception // exception poa->set_servant_manager (PortableServer::ServantManager::_nil() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (PortableServer::POA::WrongPolicy, ex) { @@ -91,8 +89,7 @@ test_get_servant_with_no_set (PortableServer::POA_ptr poa) // Getting the default servant without one set whould give a NoServant // exception PortableServer::Servant servant = - poa->get_servant (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa->get_servant (); ACE_UNUSED_ARG (servant); } @@ -121,25 +118,20 @@ test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa PortableServer::ObjectId* id = root_poa->activate_object (&test ACE_ENV_ARG_PARAMETER); - ACE_CHECK; expected_refcount++; CORBA::Object_var object = root_poa->id_to_reference (*id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ServantBase_var servant = root_poa->reference_to_servant (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; expected_refcount++; root_poa->deactivate_object (*id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; expected_refcount--; CORBA::ULong refcount = - test._refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + test._refcount_value (); ACE_UNUSED_ARG (refcount); ACE_UNUSED_ARG (expected_refcount); @@ -159,24 +151,20 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow to POA. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the new POA. CORBA::PolicyList policies (3); @@ -186,19 +174,16 @@ main (int argc, char **argv) policies[0] = root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Id Uniqueness Policy. policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Servant Retention Policy. policies[2] = root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create POA to host default servant. ACE_CString name = "Default Servant"; @@ -207,7 +192,6 @@ main (int argc, char **argv) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Destroy policies. for (CORBA::ULong i = 0; @@ -215,17 +199,14 @@ main (int argc, char **argv) ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy->destroy (); } // Activate POA manager. - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); test_reference_to_servant_active_object(root_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Test servant. test_i test; @@ -240,7 +221,6 @@ main (int argc, char **argv) // Register default servant. default_servant_poa->set_servant (&test ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; expected_refcount++; // Create dummy id. @@ -251,13 +231,11 @@ main (int argc, char **argv) object = default_servant_poa->create_reference ("IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Invoke id_to_servant(). Should retrieve default servant. PortableServer::ServantBase_var servant = default_servant_poa->id_to_servant (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; expected_refcount++; // Assert correctness. @@ -267,7 +245,6 @@ main (int argc, char **argv) servant = default_servant_poa->reference_to_servant (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; expected_refcount++; // Assert correctness. @@ -278,16 +255,14 @@ main (int argc, char **argv) "Default_Servant test successful\n")); CORBA::ULong refcount = - test._refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test._refcount_value (); ACE_UNUSED_ARG (refcount); ACE_UNUSED_ARG (expected_refcount); ACE_ASSERT (expected_refcount == refcount); // Destroy the ORB. - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -295,7 +270,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/EndpointPolicy/Hello.cpp b/TAO/tests/POA/EndpointPolicy/Hello.cpp index 70af3ea8a11..65c22a9f8ed 100644 --- a/TAO/tests/POA/EndpointPolicy/Hello.cpp +++ b/TAO/tests/POA/EndpointPolicy/Hello.cpp @@ -11,14 +11,14 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Hello::get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Hello::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/POA/EndpointPolicy/Hello.h b/TAO/tests/POA/EndpointPolicy/Hello.h index 1a404058944..6131e1a3c88 100644 --- a/TAO/tests/POA/EndpointPolicy/Hello.h +++ b/TAO/tests/POA/EndpointPolicy/Hello.h @@ -17,10 +17,10 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL) + virtual char * get_string (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/POA/EndpointPolicy/client.cpp b/TAO/tests/POA/EndpointPolicy/client.cpp index 61d7e6af070..c2d1c7593ce 100644 --- a/TAO/tests/POA/EndpointPolicy/client.cpp +++ b/TAO/tests/POA/EndpointPolicy/client.cpp @@ -47,13 +47,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -69,7 +67,6 @@ main (int argc, char *argv[]) (bad_ior ? "fail" : "work"))); Test::Hello_var hello = Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (hello.in ())) { @@ -80,8 +77,7 @@ main (int argc, char *argv[]) } CORBA::String_var the_string = - hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->get_string (); if (bad_ior) { @@ -91,8 +87,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "client: success!\n")); - hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + hello->shutdown (); } ACE_CATCHANY { @@ -106,7 +101,7 @@ main (int argc, char *argv[]) } ACE_ENDTRY; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (); return 0; } diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp index 1471f38f8b3..835dfbc8b43 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.cpp +++ b/TAO/tests/POA/Etherealization/Etherealization.cpp @@ -39,7 +39,7 @@ class test_i_with_reference_counting : public virtual POA_test { public: - void method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -111,8 +111,7 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id, delete servant; else { - servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_remove_ref (); } } @@ -128,24 +127,20 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::PolicyList policies (3); policies.length (3); @@ -154,29 +149,24 @@ main (int argc, char **argv) policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Lifespan Policy policies[1] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Request Processing Policy policies[2] = root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Create servant activator. PortableServer::ServantManager_var servant_manager = @@ -185,7 +175,6 @@ main (int argc, char **argv) // Set servant_activator as the servant_manager of child POA. child_poa->set_servant_manager (servant_manager.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; { // Create a reference with user created ID in child POA which @@ -197,19 +186,15 @@ main (int argc, char **argv) child_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var test = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - test->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->method (); child_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } { @@ -222,19 +207,15 @@ main (int argc, char **argv) child_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var test = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - test->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test->method (); child_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } { @@ -247,11 +228,9 @@ main (int argc, char **argv) child_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; child_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } { @@ -264,15 +243,12 @@ main (int argc, char **argv) child_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var oid = child_poa->reference_to_id (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; child_poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_DEBUG ((LM_DEBUG, @@ -284,7 +260,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp index 7880507c3fa..b92532c9614 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp @@ -24,10 +24,10 @@ class test_i : public POA_test { public: - void deactivate_self (ACE_ENV_SINGLE_ARG_DECL) + void deactivate_self (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); PortableServer::POA_var poa_; @@ -41,12 +41,11 @@ test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARA } void -test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL) +test_i::deactivate_self (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->poa_->deactivate_object (this->id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Exception flag int expected_exception_raised = 0; @@ -55,7 +54,6 @@ test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL) { this->poa_->deactivate_object (this->id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (PortableServer::POA::ObjectNotActive, ex) { @@ -68,7 +66,6 @@ test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL) ACE_ASSERT (0); } ACE_ENDTRY; - ACE_CHECK; // Make sure an exception was raised and it was of the correct type. ACE_ASSERT (expected_exception_raised); @@ -104,7 +101,6 @@ test_object_deactivation (PortableServer::POA_ptr poa, ACE_ASSERT (0); } ACE_ENDTRY; - ACE_CHECK; // Make sure an exception was raised and it was of the correct // type. @@ -115,11 +111,9 @@ test_object_deactivation (PortableServer::POA_ptr poa, poa->activate_object_with_id (id, &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; poa->deactivate_object (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Reset flag expected_exception_raised = 0; @@ -141,7 +135,6 @@ test_object_deactivation (PortableServer::POA_ptr poa, ACE_ASSERT (0); } ACE_ENDTRY; - ACE_CHECK; // Make sure an exception was raised and it was of the correct // type. @@ -150,7 +143,6 @@ test_object_deactivation (PortableServer::POA_ptr poa, poa->activate_object_with_id (id, &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; servant.poa_ = PortableServer::POA::_duplicate (poa); @@ -158,11 +150,9 @@ test_object_deactivation (PortableServer::POA_ptr poa, servant.id_ = id; test_var test = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant._this (); - test->deactivate_self (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + test->deactivate_self (); // ACE_ASSERT dissappears in non-debug builds ACE_UNUSED_ARG (expected_exception_raised); @@ -181,24 +171,20 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::PolicyList empty_policies; PortableServer::POA_var child_poa = @@ -206,32 +192,26 @@ main (int argc, char **argv) poa_manager.in (), empty_policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); obj = root_poa->create_reference ("IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_object_deactivation (root_poa.in (), id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; id = PortableServer::string_to_ObjectId ("good id"); test_object_deactivation (child_poa.in (), id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -239,7 +219,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp index 1f3265ec6c4..28a88c7a4bb 100644 --- a/TAO/tests/POA/Identity/Identity.cpp +++ b/TAO/tests/POA/Identity/Identity.cpp @@ -30,7 +30,7 @@ public: { } - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + PortableServer::POA_ptr _default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -55,15 +55,12 @@ create_poas (PortableServer::POA_ptr root_poa, policies[0] = root_poa->create_lifespan_policy (lifespan_policy ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policies[2] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Creation of the firstPOA ACE_CString name = "firstPOA"; @@ -71,14 +68,11 @@ create_poas (PortableServer::POA_ptr root_poa, PortableServer::POAManager::_nil (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policies[1]->destroy (); policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Creation of the secondPOA name = "secondPOA"; @@ -86,14 +80,11 @@ create_poas (PortableServer::POA_ptr root_poa, PortableServer::POAManager::_nil (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policies[2]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policies[2]->destroy (); policies[2] = root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Creation of the thirdPOA name = "thirdPOA"; @@ -101,14 +92,11 @@ create_poas (PortableServer::POA_ptr root_poa, PortableServer::POAManager::_nil (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policies[1]->destroy (); policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Creation of the forthPOA name = "forthPOA"; @@ -116,15 +104,13 @@ create_poas (PortableServer::POA_ptr root_poa, PortableServer::POAManager::_nil (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Creation of the new POAs over, so destroy the policies for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policies[i]->destroy (); } } @@ -143,42 +129,34 @@ test_poas (CORBA::ORB_ptr orb, CORBA::Object_var obj = root_poa->create_reference ("IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; root_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ServantBase_var servant_from_reference = root_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ServantBase_var servant_from_id = root_poa->id_to_servant (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (servant_from_reference.in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -190,49 +168,40 @@ test_poas (CORBA::ORB_ptr orb, obj = root_poa->servant_to_reference (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + obj = servant._this (); string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_servant = root_poa->servant_to_id (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (id_from_servant.in () == id.in ()); root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (perform_deactivation_test) { root_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; servant_from_reference = root_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (servant_from_reference.in () == &servant); root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -241,32 +210,26 @@ test_poas (CORBA::ORB_ptr orb, PortableServer::ObjectId_var id = root_poa->activate_object (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); obj = root_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } { @@ -274,42 +237,34 @@ test_poas (CORBA::ORB_ptr orb, CORBA::Object_var obj = first_poa->create_reference ("IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id = first_poa->reference_to_id (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; first_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; obj = first_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ServantBase_var servant_from_reference = first_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ServantBase_var servant_from_id = first_poa->id_to_servant (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (servant_from_reference .in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -321,24 +276,20 @@ test_poas (CORBA::ORB_ptr orb, first_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (perform_deactivation_test) { first_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; servant_from_reference = first_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (servant_from_reference.in () == &servant); first_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -347,32 +298,26 @@ test_poas (CORBA::ORB_ptr orb, PortableServer::ObjectId_var id = first_poa->activate_object (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var obj = first_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); obj = first_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); first_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } { @@ -380,42 +325,34 @@ test_poas (CORBA::ORB_ptr orb, CORBA::Object_var obj = second_poa->create_reference ("IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id = second_poa->reference_to_id (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; second_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; obj = second_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ServantBase_var servant_from_reference = second_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ServantBase_var servant_from_id = second_poa->id_to_servant (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (servant_from_reference.in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -427,49 +364,40 @@ test_poas (CORBA::ORB_ptr orb, obj = second_poa->servant_to_reference (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + obj = servant._this (); string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_servant = second_poa->servant_to_id (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (id_from_servant.in () == id.in ()); second_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (perform_deactivation_test) { second_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; servant_from_reference = second_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (servant_from_reference.in () == &servant); second_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -478,32 +406,26 @@ test_poas (CORBA::ORB_ptr orb, PortableServer::ObjectId_var id = second_poa->activate_object (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var obj = second_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); obj = second_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); second_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } { @@ -513,17 +435,14 @@ test_poas (CORBA::ORB_ptr orb, CORBA::Object_var obj = third_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_reference = third_poa->reference_to_id (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = PortableServer::ObjectId_to_string (id_from_reference.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); @@ -533,27 +452,22 @@ test_poas (CORBA::ORB_ptr orb, third_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; obj = third_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ServantBase_var servant_from_reference = third_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ServantBase_var servant_from_id = third_poa->id_to_servant (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (servant_from_reference.in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -565,26 +479,21 @@ test_poas (CORBA::ORB_ptr orb, obj = third_poa->servant_to_reference (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); - obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + obj = servant._this (); string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_servant = third_poa->servant_to_id (&servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = PortableServer::ObjectId_to_string (id_from_servant.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); @@ -593,24 +502,20 @@ test_poas (CORBA::ORB_ptr orb, third_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (perform_deactivation_test) { third_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; servant_from_reference = third_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (servant_from_reference.in () == &servant); third_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -621,17 +526,14 @@ test_poas (CORBA::ORB_ptr orb, CORBA::Object_var obj = forth_poa->create_reference_with_id (id.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ObjectId_var id_from_reference = forth_poa->reference_to_id (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = PortableServer::ObjectId_to_string (id_from_reference.in ()); ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); @@ -641,27 +543,22 @@ test_poas (CORBA::ORB_ptr orb, forth_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; obj = forth_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; string = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ())); PortableServer::ServantBase_var servant_from_reference = forth_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ServantBase_var servant_from_id = forth_poa->id_to_servant (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (servant_from_reference.in () != servant_from_id.in () || servant_from_reference.in () != &servant) @@ -678,17 +575,14 @@ test_poas (CORBA::ORB_ptr orb, forth_poa->activate_object_with_id (id.in (), &servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; servant_from_reference = forth_poa->reference_to_servant (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (servant_from_reference.in () == &servant); forth_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } } @@ -702,17 +596,14 @@ main (int argc, char **argv) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters = TAO_ORB_Core_instance ()->server_factory ()->active_object_map_creation_parameters (); @@ -731,7 +622,6 @@ main (int argc, char **argv) third_poa.out (), forth_poa.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_poas (orb.in (), root_poa.in (), @@ -741,27 +631,22 @@ main (int argc, char **argv) forth_poa.in (), perform_deactivation_test ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; first_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; second_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; third_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; forth_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; create_poas (root_poa.in (), PortableServer::PERSISTENT, @@ -770,7 +655,6 @@ main (int argc, char **argv) third_poa.out (), forth_poa.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_poas (orb.in (), root_poa.in (), @@ -780,12 +664,10 @@ main (int argc, char **argv) forth_poa.in (), perform_deactivation_test ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -794,7 +676,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp index 11d740642cd..885007113bf 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp @@ -30,7 +30,7 @@ public: test_i (PortableServer::POA_ptr poa); - void method (ACE_ENV_SINGLE_ARG_DECL) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::POA_var poa_; @@ -42,7 +42,7 @@ test_i::test_i (PortableServer::POA_ptr poa) } void -test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -187,7 +187,6 @@ set_nil_servant_manager (PortableServer::POA_ptr poa) // minor code 4 poa->set_servant_manager (PortableServer::ServantManager::_nil() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJ_ADAPTER, ex) { @@ -222,7 +221,6 @@ overwrite_servant_manager (PortableServer::POA_ptr poa) // obj_adapter with minor code 6 poa->set_servant_manager (&servant_locator ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::BAD_INV_ORDER, ex) { @@ -257,24 +255,19 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.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 (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::PolicyList policies; CORBA::ULong current_length = 0; @@ -283,26 +276,22 @@ main (int argc, char **argv) policies[current_length++] = root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies.length (current_length + 1); policies[current_length++] = root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies.length (current_length + 1); policies[current_length++] = root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!set_nil_servant_manager (child_poa.in())) retval = -1; @@ -310,7 +299,6 @@ main (int argc, char **argv) Servant_Locator servant_locator (child_poa.in ()); child_poa->set_servant_manager (&servant_locator ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!overwrite_servant_manager (child_poa.in())) retval = -1; @@ -322,12 +310,10 @@ main (int argc, char **argv) child_poa->create_reference_with_id (first_oid.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var first_test = test::_narrow (first_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var second_oid = PortableServer::string_to_ObjectId ("second"); @@ -336,12 +322,10 @@ main (int argc, char **argv) child_poa->create_reference_with_id (second_oid.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var second_test = test::_narrow (second_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; first_task.object (first_test.in ()); second_task.object (second_test.in ()); @@ -355,7 +339,6 @@ main (int argc, char **argv) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s successful\n", diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp index 70b54317789..ea08b02a671 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp @@ -31,7 +31,7 @@ public: ~test_i (void); - void method (ACE_ENV_SINGLE_ARG_DECL) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::POA_var poa_; @@ -54,7 +54,7 @@ test_i::~test_i (void) } void -test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -95,13 +95,11 @@ Object_Activator::svc (void) PortableServer::ObjectId_var id = this->poa_->activate_object (servant ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->object_activated_.signal (); this->poa_->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -162,11 +160,9 @@ Servant_Activator::incarnate (const PortableServer::ObjectId &, this->id_ = this->poa_->activate_object (servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); this->poa_->deactivate_object (this->id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); int result = global_object_activator->activate (); @@ -212,8 +208,7 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &, ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_remove_ref (); } int @@ -226,24 +221,19 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.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 (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); CORBA::PolicyList policies; CORBA::ULong current_length = 0; @@ -252,34 +242,28 @@ main (int argc, char **argv) policies[current_length++] = root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("child", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Servant_Activator servant_activator (child_poa.in ()); child_poa->set_servant_manager (&servant_activator ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var first_object = child_poa->create_reference ("IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var first_test = test::_narrow (first_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var id = child_poa->reference_to_id (first_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Thread_Manager thread_manager; @@ -289,12 +273,10 @@ main (int argc, char **argv) global_object_activator = &object_activator; - first_test->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + first_test->method (); child_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Wait for the Object_Activator thread to exit. thread_manager.wait (); @@ -302,7 +284,6 @@ main (int argc, char **argv) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp index 11aa293619d..86d60cf1a65 100644 --- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp @@ -51,18 +51,15 @@ test_i::~test_i (void) { ACE_TRY_NEW_ENV { - PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (this->other_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating other servant\n")); poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -83,27 +80,22 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); test_i *servant1 = new test_i (0); test_i *servant2 = new test_i (servant1); @@ -111,29 +103,23 @@ main (int argc, char **argv) PortableServer::ObjectId_var id1 = root_poa->activate_object (servant1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Give ownership to POA. - servant1->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant1->_remove_ref (); PortableServer::ObjectId_var id2 = root_poa->activate_object (servant2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Give ownership to POA. - servant2->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant2->_remove_ref (); root_poa->deactivate_object (id2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp index 0c5c38a7ddf..60682e114db 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp @@ -56,7 +56,7 @@ class test_i : public POA_test public: test_i (ACE_Auto_Event &event); - void deactivate_self (ACE_ENV_SINGLE_ARG_DECL) + void deactivate_self (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -69,22 +69,19 @@ test_i::test_i (ACE_Auto_Event &event) } void -test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL) +test_i::deactivate_self (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (debug) ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating servant\n")); poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (debug) ACE_DEBUG ((LM_DEBUG, "(%t) Deactivation complete: signaling main thread and going to sleep\n")); @@ -154,14 +151,12 @@ Activator::svc (void) PortableServer::ObjectId_var id = this->poa_->activate_object (this->servant_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } else { this->poa_->activate_object_with_id (this->id_, this->servant_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } if (debug) @@ -197,8 +192,7 @@ Deactivator::svc (void) { ACE_TRY_NEW_ENV { - this->test_->deactivate_self (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->test_->deactivate_self (); } ACE_CATCHANY { @@ -222,7 +216,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int parse_args_result = parse_args (argc, argv); @@ -234,21 +227,17 @@ main (int argc, char **argv) CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); ACE_Auto_Event event1; test_i servant1 (event1); @@ -256,19 +245,15 @@ main (int argc, char **argv) ACE_Auto_Event event2; test_i servant2 (event2); - test_var test_object1 = servant1._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_var test_object1 = servant1._this (); - test_var test_object2 = servant2._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_var test_object2 = servant2._this (); PortableServer::ObjectId_var id1 = root_poa->reference_to_id (test_object1.in ()); - ACE_TRY_CHECK; PortableServer::ObjectId_var id2 = root_poa->reference_to_id (test_object2.in ()); - ACE_TRY_CHECK; Activator activator1 (test_object1.in (), event1, @@ -302,7 +287,6 @@ main (int argc, char **argv) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -310,7 +294,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp index 349ad507854..b1969e4d810 100644 --- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp +++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp @@ -80,7 +80,6 @@ main (int argc, char **argv) argv, "POAManagerFactoryTest" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -89,13 +88,11 @@ main (int argc, char **argv) CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow to POA. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (verbose) ACE_DEBUG ((LM_DEBUG, @@ -126,7 +123,6 @@ main (int argc, char **argv) = poa_manager_factory->create_POAManager ("POAManager1", policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; VERIFY_CONDITION (!CORBA::is_nil(poa_manager_1.in())); if (verbose) @@ -177,8 +173,7 @@ main (int argc, char **argv) ACE_ENV_ARG_PARAMETER); PortableServer::POAManager_var poa_manager_2 - = child_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + = child_poa->the_POAManager (); VERIFY_CONDITION (!CORBA::is_nil(poa_manager_2.in())); if (verbose) @@ -189,8 +184,7 @@ main (int argc, char **argv) return 1; CORBA::String_var poa_manager_2_name - = poa_manager_2->get_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + = poa_manager_2->get_id (); if (verbose) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Implicitly created POAManager's ID: [%s]\n"), @@ -204,8 +198,7 @@ main (int argc, char **argv) pretest = fail; PortableServer::POAManagerFactory::POAManagerSeq_var managers - = poa_manager_factory->list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + = poa_manager_factory->list (); VERIFY_CONDITION (managers->length () == 3); if (verbose) @@ -213,13 +206,11 @@ main (int argc, char **argv) (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed"))); PortableServer::POAManager_var root_poa_manager - = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + = root_poa->the_POAManager(); for (CORBA::ULong i = 0; i < managers->length(); ++i) { - CORBA::String_var name = managers[i]->get_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::String_var name = managers[i]->get_id (); if (verbose) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Validate listed POAManager [%s]: "), @@ -256,10 +247,8 @@ main (int argc, char **argv) PortableServer::POAManager_var manager = poa_manager_factory->find ("POAManager1" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::String_var name = manager->get_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::String_var name = manager->get_id (); VERIFY_CONDITION ((ACE_OS::strcmp (name.in (), "POAManager1") == 0 && manager.in () == poa_manager_1.in ())); @@ -280,10 +269,8 @@ main (int argc, char **argv) poa_manager_1.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager_1->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager_1->activate (); root_poa->destroy (1, 1); @@ -298,7 +285,6 @@ main (int argc, char **argv) ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, ACE_TEXT("POAManagerFactory %s\n"), (pretest == fail) ? ACE_TEXT ("succeeded") : ACE_TEXT ("failed"))); diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp index a35208aa000..831234c8537 100644 --- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp +++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp @@ -22,23 +22,21 @@ class test_i : public POA_test { public: - void destroy_poa (ACE_ENV_SINGLE_ARG_DECL) + void destroy_poa (void) ACE_THROW_SPEC ((CORBA::SystemException)); }; void -test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL) +test_i::destroy_poa (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POA_var poa = this->_default_POA (); CORBA::Boolean etherealize_objects = 1; CORBA::Boolean wait_for_completion = 0; poa->destroy (etherealize_objects, wait_for_completion ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int @@ -53,35 +51,28 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); test_i servant; - test_var test_object = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_var test_object = servant._this (); - test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_object->destroy_poa (); } ACE_CATCHANY { @@ -89,7 +80,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/Persistent_ID/client.cpp b/TAO/tests/POA/Persistent_ID/client.cpp index 45519fdd154..0813be7b6b5 100644 --- a/TAO/tests/POA/Persistent_ID/client.cpp +++ b/TAO/tests/POA/Persistent_ID/client.cpp @@ -70,7 +70,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int parse_args_result = parse_args (argc, argv); @@ -80,40 +79,30 @@ main (int argc, char **argv) CORBA::Object_var object = orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var test1 = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - test1->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test1->method (); test_var test2 = - test1->create_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test1->create_POA (); - test2->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test2->method (); - test1->destroy_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test1->destroy_POA (); test_var test3 = - test1->create_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test1->create_POA (); - test2->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test2->method (); - test3->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test3->method (); if (shutdown_server) { - test1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test1->shutdown (); } } ACE_CATCHANY @@ -122,7 +111,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp index 15f8272c1a9..6ee388c43f1 100644 --- a/TAO/tests/POA/Persistent_ID/server.cpp +++ b/TAO/tests/POA/Persistent_ID/server.cpp @@ -31,19 +31,19 @@ public: test_i (CORBA::ORB_ptr orb_ptr, PortableServer::POA_ptr poa); - void method (ACE_ENV_SINGLE_ARG_DECL) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); - test_ptr create_POA (ACE_ENV_SINGLE_ARG_DECL) + test_ptr create_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy_POA (ACE_ENV_SINGLE_ARG_DECL) + void destroy_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); protected: CORBA::ORB_var orb_; @@ -60,26 +60,22 @@ test_i::test_i (CORBA::ORB_ptr orb, } void -test_i::method (ACE_ENV_SINGLE_ARG_DECL) +test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = this->orb_->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::POA_var poa = - current->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + current->get_POA (); CORBA::String_var poa_name = - poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa->the_name (); ACE_DEBUG ((LM_DEBUG, "Method invoked on servant in POA = %s\n", @@ -87,22 +83,21 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL) } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } test_ptr -test_i::create_POA (ACE_ENV_SINGLE_ARG_DECL) +test_i::create_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::PolicyList policies (2); @@ -111,16 +106,13 @@ test_i::create_POA (ACE_ENV_SINGLE_ARG_DECL) policies[0] = this->poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (test::_nil ()); policies[1] = this->poa_->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (test::_nil ()); PortableServer::POAManager_var poa_manager = - this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (test::_nil ()); + this->poa_->the_POAManager (); ACE_CString name = "POA"; this->child_poa_ = @@ -128,15 +120,13 @@ test_i::create_POA (ACE_ENV_SINGLE_ARG_DECL) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (test::_nil ()); // Destroy the policies for (CORBA::ULong i = 0; i < policies.length (); ++i) { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policies[i]->destroy (); } test_i *servant = @@ -150,30 +140,26 @@ test_i::create_POA (ACE_ENV_SINGLE_ARG_DECL) this->oid_ = this->child_poa_->activate_object (servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (test::_nil ()); } else { this->child_poa_->activate_object_with_id (this->oid_.in (), servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (test::_nil ()); } test_var test = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (test::_nil ()); + servant->_this (); return test._retn (); } void -test_i::destroy_POA (ACE_ENV_SINGLE_ARG_DECL) +test_i::destroy_POA (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->child_poa_->destroy (1, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } const char *ior_file = "ior"; @@ -244,7 +230,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); if (result != 0) @@ -253,38 +238,31 @@ main (int argc, char **argv) CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.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 (); test_i servant (orb.in (), root_poa.in ()); test_var test = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int write_result = write_ior_to_file (ior.in ()); if (write_result != 0) return write_result; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); } ACE_CATCHANY { @@ -292,7 +270,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp index 59db0b1e922..a1f067968ca 100644 --- a/TAO/tests/POA/Policies/Policies.cpp +++ b/TAO/tests/POA/Policies/Policies.cpp @@ -38,27 +38,22 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Narrow to POA. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the POA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) @@ -66,7 +61,6 @@ main (int argc, char **argv) PortableServer::ThreadPolicy_var policy1 = root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= PortableServer::ORB_CTRL_MODEL; @@ -75,12 +69,10 @@ main (int argc, char **argv) orb->create_policy (PortableServer::THREAD_POLICY_ID, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ThreadPolicy_var policy2 = PortableServer::ThreadPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -91,7 +83,6 @@ main (int argc, char **argv) PortableServer::LifespanPolicy_var policy1 = root_poa->create_lifespan_policy (PortableServer::TRANSIENT ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= PortableServer::TRANSIENT; @@ -100,12 +91,10 @@ main (int argc, char **argv) orb->create_policy (PortableServer::LIFESPAN_POLICY_ID, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::LifespanPolicy_var policy2 = PortableServer::LifespanPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -114,7 +103,6 @@ main (int argc, char **argv) PortableServer::IdUniquenessPolicy_var policy1 = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= PortableServer::UNIQUE_ID; @@ -123,12 +111,10 @@ main (int argc, char **argv) orb->create_policy (PortableServer::ID_UNIQUENESS_POLICY_ID, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::IdUniquenessPolicy_var policy2 = PortableServer::IdUniquenessPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -137,7 +123,6 @@ main (int argc, char **argv) PortableServer::IdAssignmentPolicy_var policy1 = root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= PortableServer::USER_ID; @@ -146,12 +131,10 @@ main (int argc, char **argv) orb->create_policy (PortableServer::ID_ASSIGNMENT_POLICY_ID, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::IdAssignmentPolicy_var policy2 = PortableServer::IdAssignmentPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -162,7 +145,6 @@ main (int argc, char **argv) PortableServer::ImplicitActivationPolicy_var policy1 = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= PortableServer::IMPLICIT_ACTIVATION; @@ -171,12 +153,10 @@ main (int argc, char **argv) orb->create_policy (PortableServer::IMPLICIT_ACTIVATION_POLICY_ID, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ImplicitActivationPolicy_var policy2 = PortableServer::ImplicitActivationPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -185,7 +165,6 @@ main (int argc, char **argv) PortableServer::ServantRetentionPolicy_var policy1 = root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= PortableServer::RETAIN; @@ -194,12 +173,10 @@ main (int argc, char **argv) orb->create_policy (PortableServer::SERVANT_RETENTION_POLICY_ID, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ServantRetentionPolicy_var policy2 = PortableServer::ServantRetentionPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -208,7 +185,6 @@ main (int argc, char **argv) PortableServer::RequestProcessingPolicy_var policy1 = root_poa->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Any policy_value; policy_value <<= PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY; @@ -217,12 +193,10 @@ main (int argc, char **argv) orb->create_policy (PortableServer::REQUEST_PROCESSING_POLICY_ID, policy_value ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::RequestProcessingPolicy_var policy2 = PortableServer::RequestProcessingPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_ASSERT (policy1->value () == policy2->value ()); } @@ -240,7 +214,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/tests/POA/Reference_Counting/test.cpp b/TAO/tests/POA/Reference_Counting/test.cpp index bd7b83a4082..37f8c315906 100644 --- a/TAO/tests/POA/Reference_Counting/test.cpp +++ b/TAO/tests/POA/Reference_Counting/test.cpp @@ -33,7 +33,7 @@ public: CORBA::ULong getRefCount (PortableServer::ServantBase * sb ACE_ENV_ARG_DECL) { - return sb->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); + return sb->_refcount_value (); } int @@ -43,15 +43,12 @@ 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; PortableServer::POA_var poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -61,16 +58,13 @@ main (int argc, char * argv[]) Hello_impl * h = 0; ACE_NEW_RETURN (h,Hello_impl, 1); - CORBA::ULong before_act = h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ULong before_act = h->_refcount_value (); ACE_DEBUG ((LM_DEBUG, "Before activation: %d\n", before_act)); PortableServer::ObjectId_var oid = poa->activate_object (h ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - CORBA::ULong after_act = h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ULong after_act = h->_refcount_value (); ACE_DEBUG ((LM_DEBUG, "After activation: %d\n", after_act)); { @@ -85,17 +79,14 @@ main (int argc, char * argv[]) */ CORBA::ULong refCountBeforeIdToServant = - h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + h->_refcount_value (); ACE_DEBUG ((LM_DEBUG, "Before id_to_servant: %d\n", refCountBeforeIdToServant)); PortableServer::ServantBase_var srv = poa->id_to_servant (oid.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ULong refCountAfterIdToServant = - srv->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER);; - ACE_TRY_CHECK; + srv->_refcount_value ();; ACE_DEBUG ((LM_DEBUG, "After id_to_servant: %d\n", refCountAfterIdToServant)); @@ -110,13 +101,11 @@ main (int argc, char * argv[]) */ } - CORBA::ULong before_deact = h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ULong before_deact = h->_refcount_value (); ACE_DEBUG ((LM_DEBUG, "Before deactivate_object: %d\n", before_deact)); poa->deactivate_object (oid.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; /* * Because id_to_servant did not increment the reference count, but @@ -126,20 +115,16 @@ main (int argc, char * argv[]) * correct. */ - CORBA::ULong after_deact = h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ULong after_deact = h->_refcount_value (); ACE_DEBUG ((LM_DEBUG, "After deactivate_object: %d\n", after_deact)); - h->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + h->_remove_ref (); orb->shutdown (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp index f841fcdfdfd..c1478b9964a 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp @@ -28,10 +28,10 @@ class test_i : public virtual POA_test public: test_i (PortableServer::POA_ptr poa); - void method (ACE_ENV_SINGLE_ARG_DECL) + void method (void) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (void); private: PortableServer::POA_var poa_; @@ -45,7 +45,7 @@ test_i::test_i (PortableServer::POA_ptr poa) } void -test_i::method (ACE_ENV_SINGLE_ARG_DECL) +test_i::method (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -63,16 +63,14 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "Calling self from %t\n")); - test_var self = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + test_var self = this->_this (); - self->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + self->method (); } } PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -97,8 +95,7 @@ Worker::svc (void) { ACE_TRY_NEW_ENV { - this->test_->method (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->test_->method (); } ACE_CATCHANY { @@ -120,23 +117,19 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); // Policies for the new POA. CORBA::PolicyList policies (2); @@ -145,12 +138,10 @@ main (int argc, char **argv) policies[0] = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; policies[1] = root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Creation of the child POA. PortableServer::POA_var child_poa = @@ -158,28 +149,23 @@ main (int argc, char **argv) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Destroy the policies 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 (); test_i servant1 (child_poa.in ()); test_i servant2 (child_poa.in ()); - test_var object1 = servant1._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_var object1 = servant1._this (); - test_var object2 = servant2._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_var object2 = servant2._this (); Worker worker1 (object1.in ()); Worker worker2 (object2.in ()); @@ -198,7 +184,6 @@ main (int argc, char **argv) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp index 8b945a68c1b..cc0249af4b4 100644 --- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp +++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp @@ -21,7 +21,7 @@ class test_i : public POA_test { public: - void destroy_poa (ACE_ENV_SINGLE_ARG_DECL) + void destroy_poa (void) ACE_THROW_SPEC ((CORBA::SystemException)); void test_poa (PortableServer::POA_ptr poa); @@ -36,7 +36,7 @@ test_i::test_poa (PortableServer::POA_ptr poa) } void -test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL) +test_i::destroy_poa (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean etherealize_objects = 1; @@ -44,7 +44,6 @@ test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL) this->poa_->destroy (etherealize_objects, wait_for_completion ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } PortableServer::POA_ptr @@ -58,27 +57,22 @@ init_orb (int argc, argv, orb_name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (PortableServer::POA::_nil ()); + poa_manager->activate (); return root_poa._retn (); } @@ -96,18 +90,15 @@ main (int argc, argv, "first ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var second_poa = init_orb (argc, argv, "second ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_i servant; - test_var test_object = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_var test_object = servant._this (); int expected_exception_raised = 0; @@ -115,7 +106,7 @@ main (int argc, { servant.test_poa (first_poa.in ()); - test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER); + test_object->destroy_poa (); ACE_TRY_CHECK_EX (first_poa); } ACE_CATCH (CORBA::BAD_INV_ORDER, ex) @@ -129,7 +120,6 @@ main (int argc, return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); // Make sure an exception was raised and it was of the correct // type. @@ -140,11 +130,9 @@ main (int argc, servant.test_poa (second_poa.in ()); - test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_object->destroy_poa (); first_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -152,7 +140,6 @@ main (int argc, return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } |