diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp index cdebf4d772f..d00d2767c9b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp @@ -39,7 +39,6 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components) TAO_Lookup<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* lookup = new TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> (*this); this->trading_components ().lookup_if (lookup->_this (env)); - lookup->_remove_ref (env); this->ifs_[LOOKUP_IF] = lookup; } if (ACE_BIT_ENABLED (components, REGISTER)) @@ -47,7 +46,6 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components) TAO_Register<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* reg = new TAO_Register<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> (*this); this->trading_components ().register_if (reg->_this (env)); - reg->_remove_ref (env); this->ifs_[REGISTER_IF] = reg; } if (ACE_BIT_ENABLED (components, ADMIN)) @@ -55,7 +53,6 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components) TAO_Admin<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* admin = new TAO_Admin<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> (*this); this->trading_components ().admin_if (admin->_this (env)); - admin->_remove_ref (env); this->ifs_[ADMIN_IF] = admin; } if (ACE_BIT_ENABLED (components, PROXY)) @@ -63,7 +60,6 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components) TAO_Proxy<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* proxy = new TAO_Proxy<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> (*this); this->trading_components ().proxy_if (proxy->_this (env)); - proxy->_remove_ref (env); this->ifs_[PROXY_IF] = proxy; } if (ACE_BIT_ENABLED (components, LINK)) @@ -71,7 +67,6 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components) TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* link = new TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> (*this); this->trading_components ().link_if (link->_this (env)); - link->_remove_ref (env); this->ifs_[LINK_IF] = link; } } @@ -94,18 +89,17 @@ TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void) PortableServer::POA_var poa = this->ifs_[i]->_default_POA (TAO_TRY_ENV); TAO_CHECK_ENV; - PortableServer::ObjectId_var id = poa->servant_to_id (this->ifs_[i], TAO_TRY_ENV); TAO_CHECK_ENV; - poa->deactivate_object (id.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; } TAO_CATCHANY { } TAO_ENDTRY; + + delete this->ifs_[i]; } } } |