diff options
Diffstat (limited to 'TAO/tests/Exposed_Policies/Policy_Verifier.cpp')
| -rw-r--r-- | TAO/tests/Exposed_Policies/Policy_Verifier.cpp | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp index 4541f43613c..20a352ded22 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp @@ -24,7 +24,6 @@ Policy_Verifier::init (int argc, { this->orb_ = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); ACE_Arg_Shifter arg_shifter (argc, argv); @@ -36,7 +35,6 @@ Policy_Verifier::init (int argc, { this->rt_poa_properties_ = RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); this->priority_bands_ = this->rt_poa_properties_->priority_bands ().length (); } @@ -44,7 +42,6 @@ Policy_Verifier::init (int argc, { this->rt_object_properties_ = RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); } else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR"))) { @@ -54,7 +51,6 @@ Policy_Verifier::init (int argc, RT_Properties, CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (false); } this->rt_poa_properties_->ior_source (arg); ACE_OS::strcpy (this->base_object_ref_, "file://"); @@ -69,7 +65,6 @@ Policy_Verifier::init (int argc, RT_Properties, CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (false); } this->rt_object_properties_->ior_source (arg); ACE_OS::strcpy (this->overridden_object_ref_, "file://"); @@ -92,26 +87,22 @@ Policy_Verifier::init (int argc, // Get the Object references. CORBA::Object_var object = this->orb_->string_to_object (this->base_object_ref_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n")) return false; this->base_object_ = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); if (!Policy_Verifier::check_reference (this->base_object_.in (), "Unable to convert the IOR to the proper object reference.\n")) return false; object = this->orb_->string_to_object (this->overridden_object_ref_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n")) return false; this->overridden_object_ = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); if (!Policy_Verifier::check_reference (this->overridden_object_.in (), "Unable to convert the IOR to the proper object reference.\n")) @@ -126,12 +117,10 @@ Policy_Verifier::run (ACE_ENV_SINGLE_ARG_DECL ) this->verify_reference (this->base_object_.in (), this->rt_poa_properties_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->verify_reference (this->overridden_object_.in (), this->rt_object_properties_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -145,7 +134,6 @@ Policy_Verifier::verify_reference (Counter_ptr object, CORBA::Policy_var policy_var = object->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Priority Policy.\n")) { @@ -153,12 +141,10 @@ Policy_Verifier::verify_reference (Counter_ptr object, RTCORBA::PriorityModelPolicy::_narrow (policy_var.in ()); RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + priority_policy->priority_model (); RTCORBA::Priority priority = - priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + priority_policy->server_priority (); if (priority_model == RTCORBA::SERVER_DECLARED) ACE_DEBUG ((LM_DEBUG, @@ -179,7 +165,6 @@ Policy_Verifier::verify_reference (Counter_ptr object, policy_var = object->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Priority Banded Policy\n")) @@ -188,7 +173,6 @@ Policy_Verifier::verify_reference (Counter_ptr object, RTCORBA::PriorityBandedConnectionPolicy_var priority_banded_policy = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (Policy_Verifier::check_reference (priority_banded_policy.in (), @@ -225,18 +209,15 @@ Policy_Verifier::verify_reference (Counter_ptr object, } policy_var = object->_get_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Client Protocol Policy\n")) { RTCORBA::ClientProtocolPolicy_var client_protocol_policy = RTCORBA::ClientProtocolPolicy::_narrow (policy_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::ProtocolList_var protocol_list = - client_protocol_policy->protocols (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client_protocol_policy->protocols (); for (unsigned int i = 0; i < protocol_list->length (); i++) ACE_DEBUG ((LM_DEBUG, |