diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index 06eb43a44b5..61f3fab9594 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -158,7 +158,6 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa, poa_id, context_size), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (result._retn ()); // Put <context_impl> into the auto pointer temporarily, in case next // allocation fails. @@ -168,7 +167,6 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa, ACE_NEW_THROW_EX (context, TAO_Naming_Context (context_impl), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (result._retn ()); // Let <implementation> know about it's <interface>. context_impl->interface (context); @@ -185,22 +183,19 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa, poa->activate_object_with_id (id.in (), context ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (result._retn ()); - result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); + result = context->_this (); return result._retn (); } CosNaming::NamingContext_ptr -TAO_Transient_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) +TAO_Transient_Naming_Context::new_context (void) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); // Check to make sure this object didn't have <destroy> method // invoked on it. @@ -221,7 +216,6 @@ TAO_Transient_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) poa_id, this->transient_context_->total_size () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); return result._retn (); } @@ -238,14 +232,12 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, ACE_NEW_THROW_EX (bl, CosNaming::BindingList (0), CORBA::NO_MEMORY ()); - ACE_CHECK; // Obtain a lock before we proceed with the operation. ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); - ACE_CHECK; // Check to make sure this object didn't have <destroy> method // invoked on it. @@ -257,7 +249,6 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, ACE_NEW_THROW_EX (hash_iter, HASH_MAP::ITERATOR (transient_context_->map ()), CORBA::NO_MEMORY ()); - ACE_CHECK; // Store <hash_iter temporarily in auto pointer, in case we'll have // some failures and throw an exception. @@ -310,7 +301,6 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, ACE_NEW_THROW_EX (bind_iter, ITER_SERVANT (this, hash_iter, this->poa_.in (), this->lock_), CORBA::NO_MEMORY ()); - ACE_CHECK; // Release <hash_iter> from auto pointer, and start using // reference counting to control our servant. @@ -319,8 +309,7 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, // Increment reference count on this Naming Context, so it doesn't get // deleted before the BindingIterator servant gets deleted. - interface_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + interface_->_add_ref (); // Register with the POA. char poa_id[BUFSIZ]; @@ -334,10 +323,8 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, this->poa_->activate_object_with_id (id.in (), bind_iter ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - bi = bind_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + bi = bind_iter->_this (); } } |