diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp index 1daca1ca553..e7235ed53ff 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp @@ -338,7 +338,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa, ACE_Auto_Basic_Ptr<TAO_Persistent_Naming_Context> temp (context_impl); if (context_impl->init (context_size) == -1) - ACE_THROW_RETURN (CORBA::NO_MEMORY (), result._retn ()); + throw CORBA::NO_MEMORY (); // Insure appropriate cleanup in case of exception conditions ahead. context_impl->set_cleanup_level (1); @@ -347,7 +347,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa, if (ind->bind (context_impl->poa_id_.c_str (), context_impl->counter_, context_impl->persistent_context_->map ()) == -1) - ACE_THROW_RETURN (CORBA::INTERNAL (), result._retn ()); + throw CORBA::INTERNAL (); // Insure appropriate cleanup in case of exception conditions ahead. context_impl->set_cleanup_level (2); @@ -391,8 +391,7 @@ TAO_Persistent_Naming_Context::new_context (void) // Check to make sure this object didn't have <destroy> method // invoked on it. if (this->destroyed_) - ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), - CosNaming::NamingContext::_nil ()); + throw CORBA::OBJECT_NOT_EXIST (); // Generate a POA id for the new context. char poa_id[BUFSIZ]; |