diff options
Diffstat (limited to 'TAO/tao/Client_Priority_Policy.cpp')
| -rw-r--r-- | TAO/tao/Client_Priority_Policy.cpp | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/TAO/tao/Client_Priority_Policy.cpp b/TAO/tao/Client_Priority_Policy.cpp index d9742e8c143..6707aca5d48 100644 --- a/TAO/tao/Client_Priority_Policy.cpp +++ b/TAO/tao/Client_Priority_Policy.cpp @@ -12,17 +12,13 @@ ACE_RCSID(TAO, Client_Priority_Policy, "$Id$") TAO_Client_Priority_Policy::TAO_Client_Priority_Policy ( - PortableServer::POA_ptr poa, const TAO::PrioritySpecification &priority_spec) - : poa_ (PortableServer::POA::_duplicate (poa)), - priority_spec_ (priority_spec) + : priority_spec_ (priority_spec) { } TAO_Client_Priority_Policy::TAO_Client_Priority_Policy (const TAO_Client_Priority_Policy &rhs) - : TAO_RefCountServantBase (rhs), - POA_TAO::ClientPriorityPolicy (rhs), - poa_ (rhs.poa_), + : TAO::ClientPriorityPolicy (), priority_spec_ (rhs.priority_spec_) { } @@ -40,8 +36,7 @@ TAO_Client_Priority_Policy::policy_type (CORBA_Environment &) } CORBA::Policy_ptr -TAO_Client_Priority_Policy::create (PortableServer::POA_ptr poa, - const CORBA::Any& val, +TAO_Client_Priority_Policy::create (const CORBA::Any& val, CORBA::Environment &ACE_TRY_ENV) { // Future policy implementors: notice how the following code is @@ -54,16 +49,11 @@ TAO_Client_Priority_Policy::create (PortableServer::POA_ptr poa, TAO_Client_Priority_Policy *tmp; ACE_NEW_THROW_EX (tmp, - TAO_Client_Priority_Policy (poa, *priority_spec), + TAO_Client_Priority_Policy (*priority_spec), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - PortableServer::ServantBase_var clone (tmp); - - CORBA::Policy_var result = tmp->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - - return result._retn (); + return tmp; } TAO_Client_Priority_Policy * @@ -88,28 +78,12 @@ TAO_Client_Priority_Policy::copy (CORBA_Environment &ACE_TRY_ENV) CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - PortableServer::ServantBase_var clone (tmp); - - CORBA::Policy_var result = tmp->_this (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - - return result._retn (); + return tmp; } void -TAO_Client_Priority_Policy::destroy (CORBA_Environment &ACE_TRY_ENV) -{ - PortableServer::ObjectId_var id = - this->poa_->servant_to_id (this, ACE_TRY_ENV); - ACE_CHECK; - this->poa_->deactivate_object (id.in (), ACE_TRY_ENV); - ACE_CHECK; -} - -PortableServer::POA_ptr -TAO_Client_Priority_Policy::_default_POA (CORBA_Environment &) +TAO_Client_Priority_Policy::destroy (CORBA_Environment &) { - return PortableServer::POA::_duplicate (this->poa_.in ()); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) |