diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-12-03 09:22:25 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-12-03 09:22:25 +0000 |
| commit | 9199288dbd978f2d7869b494841f8c925e2a308e (patch) | |
| tree | 16eb5f3439fc22ae3a0ad2522f3d25ae14920cb0 /TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp | |
| parent | 20c1484911b1f06b6f90b11c22cf201608ad49e5 (diff) | |
| download | ATCD-9199288dbd978f2d7869b494841f8c925e2a308e.tar.gz | |
Wed Dec 3 09:22:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index 76eee31b28d..0535a464323 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -497,8 +497,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, // Now make sure this directory exists if (ACE_OS::access (persistence_location, W_OK|X_OK)) { - ACE_ERROR ((LM_ERROR, "Invalid persistence directory\n")); - return -1; + ACE_ERROR_RETURN ((LM_ERROR, "Invalid persistence directory\n"), -1); } #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) @@ -737,12 +736,18 @@ TAO_Naming_Server::fini (void) CORBA::Object_var svc = this->orb_->unregister_initial_reference ("NameService"); #endif /* CORBA_E_MICRO */ + } catch (const CORBA::Exception&) { // Ignore } + naming_context_ = CosNaming::NamingContext::_nil (); + ns_poa_ = PortableServer::POA::_nil (); + root_poa_ = PortableServer::POA::_nil (); + orb_ = CORBA::ORB::_nil (); + if (this->ior_multicast_ != 0) { orb_->orb_core()->reactor ()->remove_handler (this->ior_multicast_, |