(close) moved deletion of name_options_ from dtor to close (), because when Service_Repository is closed, it calls close () instead of deleting the service

1 files changed, 3 insertions, 3 deletions

diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index 7e0b1534076..d47a8ee7aab 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -101,6 +101,9 @@ ACE_Naming_Context::close (void)
 {
   ACE_TRACE ("ACE_Naming_Context::close");
 
+  delete this->name_options_;
+  this->name_options_ = 0;
+
   delete this->name_space_;
   this->name_space_ = 0;
 
@@ -324,9 +327,6 @@ ACE_Naming_Context::~ACE_Naming_Context (void)
   ACE_TRACE ("ACE_Naming_Context::~ACE_Naming_Context");
 
   this->close ();
-
-  delete this->name_options_;
-  this->name_options_ = 0;
 }
 
 void