diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index c63a5257c58..991c107ac90 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -19,14 +19,12 @@ TAO_Security_ORBInitializer::pre_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - // @@ This is busted. TAO_ORBInitInfo should do proper reference // counting. // Narrow to a TAO_ORBInitInfo object to get access to the // allocate_tss_slot_id() TAO extension. - TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info, - ACE_TRY_ENV); + TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (tao_info.in ())) @@ -43,11 +41,11 @@ TAO_Security_ORBInitializer::pre_init ( // Reserve a TSS slot in the ORB core internal TSS resources for the // thread-specific portion of Security::Current. - size_t tss_slot = tao_info->allocate_tss_slot_id (0, - ACE_TRY_ENV); + size_t tss_slot = tao_info->allocate_tss_slot_id (0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var orb_id = info->orb_id (ACE_TRY_ENV); + CORBA::String_var orb_id = info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the SecurityLevel2::Current object. @@ -66,8 +64,8 @@ TAO_Security_ORBInitializer::pre_init ( // Register the SecurityLevel2::Current object reference with the // ORB. info->register_initial_reference ("SecurityCurrent", - security_current.in (), - ACE_TRY_ENV); + security_current.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -77,17 +75,15 @@ TAO_Security_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - - this->register_policy_factories (info, - ACE_TRY_ENV); + this->register_policy_factories (info + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_Security_ORBInitializer::register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info, - CORBA::Environment &ACE_TRY_ENV) + PortableInterceptor::ORBInitInfo_ptr info + TAO_ENV_ARG_DECL) { // Register the security policy factories. @@ -101,41 +97,41 @@ TAO_Security_ORBInitializer::register_policy_factories ( // the different types of security policies. CORBA::PolicyType type; - + type = Security::SecQOPPolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecMechanismsPolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecInvocationCredentialsPolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecFeaturePolicy; // Deprecated info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecDelegationDirectivePolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecEstablishTrustPolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // ---------------------------------------------------------------- |