diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 2003-06-24 17:34:47 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 2003-06-24 17:34:47 +0000 |
| commit | 33ba1797c415c9bddff5bc4c38307dd3dd93b3ca (patch) | |
| tree | c245fc4d6b69b3e976c2ccdff4ee8aafd5e5cfc4 | |
| parent | 59404334a17f6c854c8f9cd5451fd5bd16a6b2dd (diff) | |
| download | ATCD-33ba1797c415c9bddff5bc4c38307dd3dd93b3ca.tar.gz | |
Tue Jun 24 11:54:29 2003 Chris Cleeland <cleeland_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp | 7 |
2 files changed, 12 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index efab48b01df..49a76e10b18 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Jun 24 11:54:29 2003 Chris Cleeland <cleeland_c@ociweb.com> + + * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp (bind_new_context): + + Fixed compile errors where there was a return with no value. + This only caused problems on a few platforms for some reason. + Tue Jun 24 11:34:53 2003 Pradeep Gore <pradeep@oomworks.com> Simple example to show how to use RTCORBA Lanes with RT Notification. @@ -20,7 +27,7 @@ Tue Jun 24 11:34:53 2003 Pradeep Gore <pradeep@oomworks.com> * orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp: * orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h: - Task to run ORB::run method. + Task to run ORB::run method. * orbsvcs/examples/Notify/Lanes/Supplier.cpp: * orbsvcs/examples/Notify/Lanes/Supplier.h: 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 |