diff options
Diffstat (limited to 'TAO/tests/POA/Policies/Policies.cpp')
| -rw-r--r-- | TAO/tests/POA/Policies/Policies.cpp | 31 |
1 files changed, 2 insertions, 29 deletions
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; } |