summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Naming
diff options
context:
space:
mode:
authorcleeland <cleeland@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-06-24 17:34:47 +0000
committercleeland <cleeland@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-06-24 17:34:47 +0000
commit338b200d719eee3bdac3d1cfaeefbed50cc41396 (patch)
treec245fc4d6b69b3e976c2ccdff4ee8aafd5e5cfc4 /TAO/orbsvcs/orbsvcs/Naming
parentc8d886e989b49b051f10a980542ad952b6e1bb2a (diff)
downloadATCD-338b200d719eee3bdac3d1cfaeefbed50cc41396.tar.gz
Tue Jun 24 11:54:29 2003 Chris Cleeland <cleeland_c@ociweb.com>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming')
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index 464c9037c50..18794fea2da 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -984,12 +984,13 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
// Open the backing file
File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ ACE_CHECK_RETURN (CosNamgin::NamingContext::_nil ());
// Check to make sure this object didn't have <destroy> method
// invoked on it.
if (this->destroyed_)
- ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+ ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
+ CosNaming::NamingContext::_nil ());
// If we received compound name, resolve it to get the context in
// which the binding should take place, then perform the operation on
@@ -1007,7 +1008,7 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
simple_name.length (1);
simple_name[0] = n[name_len - 1];
return context->bind_new_context (simple_name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
}
// If we received a simple name, we need to bind it in this context.
else